bugfix

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -245,43 +245,46 @@ public interface OrderClubMapper {
 
     Integer getUserId(Integer orderId);
 
-    void AddUnionId(String unionId,Integer orderId);
+    void AddUnionId(String unionId, Integer orderId);
 
     String FromUnionId(Integer orderId);
 
     String UserUnionId(Integer userID);
 
     List<Integer> getProductOrder(Integer orderId);
-    /*
-     *根据orderId查询商品名称
+
+    /**
+     * 根据orderId查询商品名称
      */
     List<String> getOrderIds(Integer orderId);
-    /*
-     *根据orderId查询订单金额
+
+    /**
+     * 根据orderId查询订单金额
      */
     Double getpayTotalFee(Integer orderId);
 
-    /*
-     *根据orderId查询支付时间
+    /**
+     * 根据orderId查询支付时间
      */
     String getpayTime(Integer orderId);
 
-    /*
-     *根据orderId查询收款状态
+    /**
+     * 根据orderId查询收款状态
      */
     Integer getReceiptStatus(Integer orderId);
 
-    /*
-     *根据orderId查询二手订单标识
+    /**
+     * 根据orderId查询二手订单标识
      */
     Integer getsecondHandOrderFlag(Integer orderId);
 
-    /*
-     *根据orderId查询返佣订单标识
+    /**
+     * 根据orderId查询返佣订单标识
      */
     Integer getrebateFlag(Integer orderId);
-    /*
-     *根据orderId查询商品编号
+
+    /**
+     * 根据orderId查询商品编号
      */
     String getOrderNo(Integer orderId);
 

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -219,7 +219,7 @@ public class OrderClubServiceImpl implements OrderClubService {
                     order.setRechargeGoods(true);
                 }
                 //是否能退货
-                if(null!=orderProduct.getReturnGoodsStutas()&&2==orderProduct.getReturnGoodsStutas()){
+                if (null != orderProduct.getReturnGoodsStutas() && 2 == orderProduct.getReturnGoodsStutas()) {
                     String helpContent = orderCommonMapper.getHelpContent(1040);
                     orderProduct.setHelpContent(helpContent);
                 }
@@ -275,16 +275,16 @@ public class OrderClubServiceImpl implements OrderClubService {
         // 收货地址
         OrderUserinfoVo userInfo = addressMapper.getOrderUserinfo(orderId);
         //订单中存在不能退货的商品则给出不能退货提示
-        boolean flag=false;
-        String helpContent=null;
-        if(null!=shopOrderList&&shopOrderList.size()>0){
-            for (ShopOrderVo so:shopOrderList) {
+        boolean flag = false;
+        String helpContent = null;
+        if (null != shopOrderList && shopOrderList.size() > 0) {
+            for (ShopOrderVo so : shopOrderList) {
                 List<OrderProductVo> orderProductList = so.getOrderProductList();
-                if(null!=orderProductList&&orderProductList.size()>0){
-                    for (OrderProductVo op:orderProductList) {
-                        if(null!=op.getReturnGoodsStutas()&&op.getReturnGoodsStutas()==2){
-                            flag=true;
-                            helpContent=op.getHelpContent();
+                if (null != orderProductList && orderProductList.size() > 0) {
+                    for (OrderProductVo op : orderProductList) {
+                        if (null != op.getReturnGoodsStutas() && op.getReturnGoodsStutas() == 2) {
+                            flag = true;
+                            helpContent = op.getHelpContent();
                         }
                     }
                 }
@@ -299,10 +299,10 @@ public class OrderClubServiceImpl implements OrderClubService {
         map.put("discernReceiptList", discernReceiptList);
         map.put("returnedPurchaseList", returnedPurchaseList);
         map.put("clause", clause);
-        if(flag){
+        if (flag) {
             map.put("returnGoodsStutas", 2);
             map.put("helpContent", helpContent);
-        }else{
+        } else {
             map.put("returnGoodsStutas", 1);
             map.put("helpContent", null);
         }
@@ -449,12 +449,9 @@ public class OrderClubServiceImpl implements OrderClubService {
                 executorService.schedule(new Runnable() {
                     @Override
                     public void run() {
-//                String orderno = orderClubMapper.getOrderNo(orderId);
                         OrderVo orderVo = orderClubMapper.getOrderMess(orderId);
-
                         String bindMobile = baseMapper.getBindMobileByUserId(order.getBuyUserId());
                         log.info(">>>>>>>>>>>>>>>>>>>>>>" + orderId);
-
                         log.info(">>>>>>>>>>>>>>>>>>>>>>" + orderVo.getProCount());
                         String name = orderVo.getProName();
                         if (name.length() > 10) {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1310,12 +1310,15 @@ public class SubmitServiceImpl implements SubmitService {
              */
             if (orderProduct.getLadderPriceFlag() == 1) {
                 // 使用阶梯价格的订单商品保存下单时的阶梯价格列表
-                orderProduct.getLadderPrices().forEach(ladderPriceVo -> {
-                    ladderPriceVo.setOrderProductId(orderProduct.getOrderProductId());
-                    ladderPriceVo.setCreateDate(date);
-                    submitMapper.insertLadderPrices(ladderPriceVo);
-                    log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>保存订单阶梯价格(insert[order_product_ladder_price])id：" + ladderPriceVo.getId() + "，orderId：" + mainOrder.getOrderId());
-                });
+                List<LadderPriceVo> ladderPrices = orderProduct.getLadderPrices();
+                if (null != ladderPrices && ladderPrices.size() > 0) {
+                    ladderPrices.forEach(ladderPriceVo -> {
+                        ladderPriceVo.setOrderProductId(orderProduct.getOrderProductId());
+                        ladderPriceVo.setCreateDate(date);
+                        submitMapper.insertLadderPrices(ladderPriceVo);
+                        log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>保存订单阶梯价格(insert[order_product_ladder_price])id：" + ladderPriceVo.getId() + "，orderId：" + mainOrder.getOrderId());
+                    });
+                }
             }
             /*
              * 机构用户 写入价格库

src/main/resources/mapper/CartSellerMapper.xml

@@ -148,7 +148,7 @@
         p.productCategory,
         p.validFlag AS validFlag,
         p.productType,
-        if(csp.id is not null and csp.status = 0,1,0) as svipProductFlag,
+        if(csp.id is not null and csp.status = 0,1,0) as svipProductFlag
 #         csp.priceType as svipPriceType,
 #         csp.discount as svipDiscount,
 #         csp.discountPrice as svipDiscountPrice

src/main/resources/mapper/OrderClubMapper.xml

@@ -204,7 +204,8 @@
         WHERE orderID = #{orderId}
     </select>
     <select id="getOrderProductList" resultType="com.caimei365.order.model.po.OrderProductPo">
-        SELECT cop.orderID               AS orderId,
+        SELECT cop.skuId,
+               cop.orderID               AS orderId,
                cop.orderNo,
                cop.shopOrderID           AS shopOrderId,
                cop.shopOrderNo,

src/main/resources/mapper/OrderCommonMapper.xml

@@ -226,7 +226,8 @@
         WHERE userId = #{userId}
     </select>
     <select id="getOrderProductByOrderId" resultType="com.caimei365.order.model.vo.OrderProductVo">
-        SELECT cop.orderProductID                                                 AS orderProductId,
+        SELECT cop.skuId,
+               cop.orderProductID                                                 AS orderProductId,
                cop.orderID                                                        AS orderId,
                cop.orderNo,
                cop.shopOrderID                                                    AS shopOrderId,
@@ -659,7 +660,8 @@
           AND shopOrderID = #{shopOrderId}
     </select>
     <select id="getOrderProductByShopOrderId" resultType="com.caimei365.order.model.vo.OrderProductVo">
-        SELECT cop.orderProductID                                                 AS orderProductId,
+        SELECT cop.skuId,
+               cop.orderProductID                                                 AS orderProductId,
                cop.orderID                                                        AS orderId,
                cop.orderNo,
                cop.shopOrderID                                                    AS shopOrderId,

src/main/resources/mapper/ShipMapper.xml

@@ -251,6 +251,7 @@
     </select>
     <select id="getOrderProductById" resultType="com.caimei365.order.model.vo.OrderProductVo">
         SELECT
+            cop.skuId,
             cop.orderProductID AS orderProductId,
             cop.orderID AS orderId,
             cop.orderNo,