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

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -242,10 +242,10 @@ public class OmsOrderServiceImpl implements OmsOrderService {
         List<OmsOrder> omsOrders = orderMapper.selectByExample(orderExample);
         // 订单号
         List<String> orderSnList = omsOrders.stream().map(OmsOrder::getOrderSn).collect(Collectors.toList());
-        HttpResponseResult httpResponseResult = webFeignService.updateShippedStatus(orderSnList);
-        if (httpResponseResult.getCode() != 200 && !httpResponseResult.getStatus()) {
-            throw new BizException("发货通知失败");
-        }
+//        HttpResponseResult httpResponseResult = webFeignService.updateShippedStatus(orderSnList);
+//        if (httpResponseResult.getCode() != 200 && !httpResponseResult.getStatus()) {
+//            throw new BizException("发货通知失败");
+//        }
 
         // 调用三方库存更新接口
         syncSkuStock(new ArrayList<>(skuIdMap.keySet()));

mec-mall/mall-mbg/src/main/java/com/yonge/cooleshow/mbg/mapper/PmsProductSkuStockRecordMapper.java

@@ -29,7 +29,7 @@ public interface PmsProductSkuStockRecordMapper {
 
     int updateByPrimaryKey(PmsProductSkuStockRecord record);
 
-    void lockStock(@Param("stockRecordIds") List<Long> stockRecordIds);
+    int lockStock(@Param("stockRecordIds") List<Long> stockRecordIds);
 
     int updateByIdAndStockSelective( PmsProductSkuStockRecord pmsProductSkuStockRecord);
 }

mec-mall/mall-mbg/src/main/resources/config/mybatis/OmsOrderMapper.xml

@@ -167,7 +167,7 @@
       receiver_detail_address, note, confirm_status, 
       delete_status, use_integration, payment_time, 
       delivery_time, receive_time, comment_time, 
-      modify_time,cart_ids,platform_type,after_sale,orchestra_id,order_form_type
+      modify_time,cart_ids,platform_type,after_sale,orchestra_id,order_form_type)
     values (#{memberId,jdbcType=BIGINT}, #{couponId}, #{orderSn,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP}, #{memberUsername,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, 
       #{payAmount,jdbcType=DECIMAL}, #{freightAmount,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL}, 

mec-mall/mall-mbg/src/main/resources/config/mybatis/PmsProductSkuStockRecordMapper.xml

@@ -314,9 +314,9 @@
     where id = #{id,jdbcType=BIGINT}
   </update>
 
-  <select id="lockStock" >
+  <select id="lockStock" resultType="java.lang.Integer">
     <!--@mbg.generated-->
-      select * from pms_product_sku_stock_record where
+      select count(1) from pms_product_sku_stock_record where
       id in
       <foreach collection="stockRecordIds" item="item" separator="," open="(" close=")">
         #{item}

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsCartItemServiceImpl.java

@@ -100,11 +100,11 @@ public class OmsCartItemServiceImpl implements OmsCartItemService {
             if (cartItem.getPromoterId() != null) {
                 existCartItem.setPromoterId(cartItem.getPromoterId());
             }
-            if(existCartItem.getQuantity() + cartItem.getQuantity() > 200) {
-                existCartItem.setQuantity(200);
-            } else {
+//            if(existCartItem.getQuantity() + cartItem.getQuantity() > 200) {
+//                existCartItem.setQuantity(200);
+//            } else {
                 existCartItem.setQuantity(cartItem.getQuantity() + existCartItem.getQuantity());
-            }
+//            }
             cartItem.setModifyDate(new Date());
             cartItemMapper.updateByPrimaryKey(existCartItem);
         }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -207,17 +207,26 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderItemList.add(orderItem);
         }
         // 判断是否存在被删除的商品 和sku 如果有被删除的商品或者sku则不允许下单
-        List<Long> productIds = orderItemList.stream().map(OmsOrderItem::getProductId).collect(Collectors.toList());
-        PmsProductExample pmsProductExample = new PmsProductExample();
-        pmsProductExample.createCriteria().andIdIn(productIds).andDeleteStatusEqualTo(1);
-        List<PmsProduct> pmsProducts = pmsProductMapper.selectByExample(pmsProductExample);
-        if (CollUtil.isNotEmpty(pmsProducts)) {
-            throw new BizException("商品已下架");
-        }
+
         List<Long> skuIds = orderItemList.stream().map(OmsOrderItem::getProductSkuId).collect(Collectors.toList());
         PmsSkuStockExample pmsSkuStockExample = new PmsSkuStockExample();
-        pmsSkuStockExample.createCriteria().andIdIn(skuIds).andDeleteStatusEqualTo(1);
+        pmsSkuStockExample.createCriteria().andIdIn(skuIds);
         List<PmsSkuStock> pmsSkuStocks = skuStockMapper.selectByExample(pmsSkuStockExample);
+        List<Long> productIds = new ArrayList<>();
+        if (CollUtil.isNotEmpty(pmsSkuStocks)) {
+            productIds = pmsSkuStocks.stream().map(PmsSkuStock::getProductId).collect(Collectors.toList());
+        }
+        if (!CollectionUtils.isEmpty(productIds)) {
+            PmsProductExample pmsProductExample = new PmsProductExample();
+            pmsProductExample.createCriteria().andIdIn(productIds).andDeleteStatusEqualTo(1);
+            List<PmsProduct> pmsProducts = pmsProductMapper.selectByExample(pmsProductExample);
+            if (CollUtil.isNotEmpty(pmsProducts)) {
+                throw new BizException("商品已下架");
+            }
+        }
+        PmsSkuStockExample pmsSkuStockExample1 = new PmsSkuStockExample();
+        pmsSkuStockExample1.createCriteria().andIdIn(skuIds).andDeleteStatusEqualTo(1);
+        pmsSkuStocks = skuStockMapper.selectByExample(pmsSkuStockExample1);
         if (CollUtil.isNotEmpty(pmsSkuStocks)) {
             throw new BizException("商品已下架");
         }
@@ -366,6 +375,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         order.setGrowth(calcGiftGrowth(orderItemList));
         //生成订单号
         order.setOrderSn(orderSn);
+        order.setOrderFormType("MEC");
         //设置自动收货天数
         List<OmsOrderSetting> orderSettings = orderSettingMapper.selectByExample(new OmsOrderSettingExample());
         if (CollUtil.isNotEmpty(orderSettings)) {
@@ -698,7 +708,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         PageHelper.startPage(pageNum, pageSize);
         OmsOrderExample orderExample = new OmsOrderExample();
         OmsOrderExample.Criteria criteria = orderExample.createCriteria();
-        criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId()).andSourceTypeNotIn(Lists.newArrayList(2));
+        criteria.andDeleteStatusEqualTo(0).andMemberIdEqualTo(member.getId()).andSourceTypeNotIn(Arrays.asList(2));
         if (status != null && !StringUtil.isEmpty(status)) {
             List<Long> list = StringUtil.toLongList(status);
             List<Integer> collect = list.stream().map(Long::intValue).collect(Collectors.toList());