kaick пре 1 година
родитељ
комит
f0b36a7733

+ 34 - 0
src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -63,6 +63,10 @@ public class ReceiptServiceImpl implements ReceiptService {
     private BaseMapper baseMapper;
     @Resource
     private cmOfflineCollectionMapper collectionMapper;
+    @Resource
+    private CmReportingClubMapper cmReportingClubMapper;
+    @Resource
+    private CmReportingMemberMapper cmReportingMemberMapper;
 
 
     /**
@@ -1778,6 +1782,36 @@ public class ReceiptServiceImpl implements ReceiptService {
                     Integer sta = 1;
                     if (orderReceipt.stream().allMatch(r -> r == 3)) {
                         sta = 3;
+                        //分销人员下单修改报备记录
+                        Integer identity = baseMapper.getUserIdentity(null,shopOrderVo.getOrderId(), null);
+                        if (identity == 8) {
+                            CmReportingClub byCmReportingClub = cmReportingClubMapper.getByCmReportingClub(new CmReportingClub()
+                                    .orderId(shopOrderVo.getOrderId())
+                                    .orderStatus(0)
+                            );
+                            //商品报备佣金
+                            BigDecimal commission = cmReportingClubMapper.getDistributionProductCommission(byCmReportingClub.productId());
+                            byCmReportingClub
+                                    .distributionId(shopOrderVo.getSpId())
+                                    .lockStatus(1)
+                                    .lockTime(new Date())
+                                    .orderStatus(1)
+                                    .splitCode(cmReportingClubMapper.getDistributionSplitCode(byCmReportingClub.distributionId()))
+                                    .commission(commission)
+                                    .splitSettleStatus(2)
+                                    .settleStatus(0);
+                            cmReportingClubMapper.updateCmReportingClub(byCmReportingClub);
+                            List<CmReportingMember> cmReportingMemberList = cmReportingMemberMapper.getCmReportingMemberList(new CmReportingMember()
+                                    .clubReportingId(Integer.valueOf(byCmReportingClub.id()))
+                                    .auditStatus(2)
+                            );
+                            //商品报备成员佣金
+                            BigDecimal memberCommission = MathUtil.div(commission, cmReportingMemberList.size(), 2);
+                            cmReportingMemberList.forEach(s -> {
+                                s.commission(memberCommission).settleStatus(2);
+                                cmReportingMemberMapper.updateCmReportingMember(s);
+                            });
+                        }
                     } else if (orderReceipt.stream().allMatch(r -> r == 1)) {
                         sta = 1;
                     } else {

+ 0 - 1
src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -1267,7 +1267,6 @@ public class ShipServiceImpl implements ShipService {
                         .commission(commission)
                         .splitSettleStatus(2)
                         .settleStatus(0);
-
                 cmReportingClubMapper.updateCmReportingClub(byCmReportingClub);
                 List<CmReportingMember> cmReportingMemberList = cmReportingMemberMapper.getCmReportingMemberList(new CmReportingMember()
                         .clubReportingId(Integer.valueOf(byCmReportingClub.id()))

+ 3 - 0
src/main/resources/mapper/CmReportingClubMapper.xml

@@ -226,6 +226,9 @@
             <if test="commission != null">commission = #{commission},</if>
             <if test="settleStatus != null">settleStatus = #{settleStatus},</if>
             <if test="settleTime != null">settleTime = #{settleTime},</if>
+            <if test="paidCommission != null">paidCommission = #{paidCommission},</if>
+            <if test="splitSettleStatus != null">splitSettleStatus = #{splitSettleStatus},</if>
+            <if test="splitCode != null and splitCode != ''">splitCode = #{splitCode},</if>
         </trim>
         where id = #{id}
     </update>