Merge remote-tracking branch 'origin/zx_saas_goods' into zx_saas_goods

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderServiceImpl.java

@@ -582,20 +582,21 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         //获取商品采购信息
         result.put("goods",musicGroupPaymentCalenderGoodsService.lambdaQuery().eq(MusicGroupPaymentCalenderGoods::getCalenderId,calenderId).list());
         MusicGroupPaymentCalenderAddress one = musicGroupPaymentCalenderAddressService.lambdaQuery().eq(MusicGroupPaymentCalenderAddress::getCalenderId, calenderId).one();
-        MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress musicGroupPaymentCalenderAddress = JSON
-            .parseObject(JSON.toJSONString(one), MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress.class);
-
-        // 查询地区信息
-        List<String> areaIds = new ArrayList<>();
-        areaIds.add(one.getProvince());
-        areaIds.add(one.getCity());
-        areaIds.add(one.getRegion());
-        areaIds = areaIds.stream().filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
-        Map<String, String> nameMapByIds = sysAreaService.getNameMapByIds(areaIds);
-        musicGroupPaymentCalenderAddress.setProvinceName(nameMapByIds.getOrDefault(one.getProvince(),""));
-        musicGroupPaymentCalenderAddress.setCityName(nameMapByIds.getOrDefault(one.getCity(),""));
-        musicGroupPaymentCalenderAddress.setRegionName(nameMapByIds.getOrDefault(one.getRegion(),""));
-        result.put("address", musicGroupPaymentCalenderAddress);
+        if(Objects.nonNull(one)){
+            MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress musicGroupPaymentCalenderAddress = JSON
+                    .parseObject(JSON.toJSONString(one), MusicGroupPaymentCalenderAddressWrapper.MusicGroupPaymentCalenderAddress.class);
+            // 查询地区信息
+            List<String> areaIds = new ArrayList<>();
+            areaIds.add(one.getProvince());
+            areaIds.add(one.getCity());
+            areaIds.add(one.getRegion());
+            areaIds = areaIds.stream().filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+            Map<String, String> nameMapByIds = sysAreaService.getNameMapByIds(areaIds);
+            musicGroupPaymentCalenderAddress.setProvinceName(nameMapByIds.getOrDefault(one.getProvince(),""));
+            musicGroupPaymentCalenderAddress.setCityName(nameMapByIds.getOrDefault(one.getCity(),""));
+            musicGroupPaymentCalenderAddress.setRegionName(nameMapByIds.getOrDefault(one.getRegion(),""));
+            result.put("address", musicGroupPaymentCalenderAddress);
+        }
         return result;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -561,7 +561,12 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     public List<OrderCreate.OrderItem> convertMallOrder(List<SellOrder> sellOrderList) {
         List<OrderCreate.OrderItem> orderItems = new ArrayList<>();
         for (SellOrder e : sellOrderList) {
-            List<GoodsSub> list = goodsSubService.lambdaQuery().eq(GoodsSub::getGoodsId, e.getParentGoodsId()).list();
+            OrderCreate.OrderItem orderItemCreate = new OrderCreate.OrderItem();
+            orderItemCreate.setProductQuantity(e.getNum());
+            orderItemCreate.setProductSkuId(e.getGoodsSkuId().longValue());
+            orderItemCreate.setRealAmount(e.getExpectAmount());
+            orderItems.add(orderItemCreate);
+            /*List<GoodsSub> list = goodsSubService.lambdaQuery().eq(GoodsSub::getGoodsId, e.getParentGoodsId()).list();
             if(CollectionUtils.isEmpty(list)){
                 throw new RuntimeException("子商品不存在，请联系管理员");
             }
@@ -586,8 +591,8 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                     orderItemCreate.setRealAmount(multiply);
                     waitRemitFee = waitRemitFee.subtract(multiply);
                 }
-                orderItems.add(orderItemCreate);
-            }
+                orderItems.add(orderItemCreate);*/
+//            }
         }
         return orderItems;
     }