分销系统V.1.0.0

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

@@ -73,6 +73,14 @@ public interface CmReportingClubMapper
      */
     public int updateCmReportingClub(CmReportingClub cmReportingClub);
 
+    /**
+     * 修改机构报备
+     *
+     * @param cmReportingClub 机构报备
+     * @return 结果
+     */
+    public int updateOrderStatus(CmReportingClub cmReportingClub);
+
     /**
      * 删除机构报备
      *

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

@@ -2089,7 +2089,7 @@ public class CartClubServiceImpl implements CartClubService {
         }*/
         // 总运费
         // 包邮或者到付 冷链费为 0
-        coldChain = 0 == shop.getPostage() ? 0 : coldChain;
+        coldChain = null==shop.getPostage()||0 == shop.getPostage() ? 0 : coldChain;
         shop.setPostage(MathUtil.sub(shop.getPostage(), coldChain).doubleValue());
         // 供应商总金额
         totalPrice.set(MathUtil.add(MathUtil.add(totalPrice.get(), shop.getPostage()), coldChain).doubleValue());

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

@@ -407,6 +407,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                     .lockStatus(1)
                     .lockTime(new Date())
                     .orderStatus(1)
+                    .splitCode(cmReportingClubMapper.getDistributionSplitCode(shopOrder.getSpId()))
                     .commission(commission)
                     .splitSettleStatus(1)
                     .settleStatus(0);
@@ -1074,6 +1075,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                     .lockStatus(1)
                     .lockTime(new Date())
                     .orderStatus(1)
+                    .splitCode(cmReportingClubMapper.getDistributionSplitCode(shopOrder.getSpId()))
                     .commission(commission)
                     .splitSettleStatus(1)
                     .settleStatus(0);

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

@@ -599,9 +599,9 @@ public class OrderClubServiceImpl implements OrderClubService {
         Integer identity = baseMapper.getIdentityByUserId(shopOrder.getUserId());
         //分销人员取消订单修改报备记录
         if (identity == 8) {
-            cmReportingClubMapper.updateCmReportingClub(new CmReportingClub()
+            cmReportingClubMapper.updateOrderStatus(new CmReportingClub()
                     .orderId(shopOrder.getOrderId())
-                    .orderStatus(0)
+                    .orderStatus(null)
                     .lockStatus(0)
             );
         }

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

@@ -1374,7 +1374,7 @@ public class SubmitServiceImpl implements SubmitService {
                     .id(orderParamBo.getClubReportingId())
                     .orderId(mainOrder.getOrderId())
                     .orderStatus(0)
-                    .splitCode(cmReportingClubMapper.getDistributionSplitCode(cmReportingClubById.distributionId()))
+//                    .splitCode(cmReportingClubMapper.getDistributionSplitCode(cmReportingClubById.distributionId()))
             );
         }
         //推送信息中心-交易物流

src/main/resources/mapper/CmReportingClubMapper.xml

@@ -232,11 +232,21 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="updateOrderStatus" parameterType="CmReportingClub">
+        update cm_reporting_club
+        <trim prefix="SET" suffixOverrides=",">
+            orderStatus = #{orderStatus},
+            <if test="orderId != null">orderId = #{orderId},</if>
+            <if test="lockStatus != null">lockStatus = #{lockStatus},</if>
+        </trim>
+        where orderId = #{orderId}
+    </update>
 
 
     <delete id="delCmReportingClubById" parameterType="String">
         delete
-        from cm_reporting_club where id = #{id}
+        from cm_reporting_club
+        where id = #{id}
     </delete>
 
     <delete id="delCmReportingClub" parameterType="CmReportingClub">