修改

src/main/java/com/szwl/service/impl/TShandeMchServiceImpl.java

@@ -100,22 +100,22 @@ public class TShandeMchServiceImpl extends ServiceImpl<TShandeMchMapper, TShande
                     BigDecimal price = order.getPrice();
                     // 代理分销获得利润
                     BigDecimal agencyPrice = price.multiply(agencyProportion.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_DOWN);
-                    agencyTotal = agencyTotal.add(agencyPrice);
-                }
-                //修改金额表的今日金额
-                TShandeMch shandeMch = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(tOrder.getAdminId())));
-                BigDecimal settleableBalance = shandeMch.getSettleableBalance();
-                if(type==1){
-                    settleableBalance = settleableBalance.add(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
-                }
-                if(type == 3){
-                    settleableBalance = settleableBalance.subtract(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
+                    //修改金额表的今日金额
+                    TShandeMch shandeMch = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(tOrder.getAdminId())));
+                    BigDecimal settleableBalance = shandeMch.getSettleableBalance();
+                    if(type==1){
+                        settleableBalance = settleableBalance.add(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
+                    }
+                    if(type == 3){
+                        settleableBalance = settleableBalance.subtract(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
+                    }
+                    shandeMch.setSettleableBalance(settleableBalance);
+                    shandeMch.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch);
+                    break;
                 }
-                shandeMch.setSettleableBalance(settleableBalance);
-                shandeMch.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch);
-                break;
+
             case 2:
                 for(TOrder order:orderList){
                     BigDecimal agencyProportion = order.getAgencyProportion();
@@ -125,36 +125,35 @@ public class TShandeMchServiceImpl extends ServiceImpl<TShandeMchMapper, TShande
                     BigDecimal agencyPrice = price.multiply(agencyProportion.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_DOWN);
                     // 经销商分销获得利润
                     BigDecimal merchantAmount = price.multiply(merchantProportion.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_DOWN);
-                    agencyTotal = agencyTotal.add(agencyPrice);
-                    merchantTotal = merchantTotal.add(merchantAmount);
-                }
-                //修改金额表的今日金额
-                //省级
-                TShandeMch shandeMch1 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getParentId())));
+                    //修改金额表的今日金额
+                    //省级
+                    TShandeMch shandeMch1 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(order.getAgencyId())));
                     BigDecimal settleableBalance1 = shandeMch1.getSettleableBalance();
                     if(type==1){
-                        settleableBalance1 = settleableBalance1.add(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance1 = settleableBalance1.add(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
                     }
                     if(type == 3){
-                        settleableBalance1 = settleableBalance1.subtract(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance1 = settleableBalance1.subtract(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
                     }
-                shandeMch1.setSettleableBalance(settleableBalance1);
-                shandeMch1.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch1.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch1);
-                //市级
-                TShandeMch shandeMch2 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getId())));
+                    shandeMch1.setSettleableBalance(settleableBalance1);
+                    shandeMch1.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch1.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch1);
+                    //市级
+                    TShandeMch shandeMch2 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getId())));
                     BigDecimal settleableBalance2 = shandeMch2.getSettleableBalance();
                     if(type==1){
-                        settleableBalance2 = settleableBalance2.add(merchantTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance2 = settleableBalance2.add(merchantAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
                     if(type == 3){
-                        settleableBalance2 = settleableBalance2.subtract(merchantTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance2 = settleableBalance2.subtract(merchantAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
-                shandeMch2.setSettleableBalance(settleableBalance2);
-                shandeMch2.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch2.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch2);
+                    shandeMch2.setSettleableBalance(settleableBalance2);
+                    shandeMch2.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch2.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch2);
+                }
+
                 break;
             case 3:
                 for(TOrder order:orderList){
@@ -172,50 +171,49 @@ public class TShandeMchServiceImpl extends ServiceImpl<TShandeMchMapper, TShande
                     agencyTotal = agencyTotal.add(agencyPrice);
                     merchantTotal = merchantTotal.add(merchantAmount);
                     personageTotal = personageTotal.add(personageAmount);
-                }
-                //修改金额表的今日金额
-                //省级
-
-                TShandeMch shandeMch3 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getAgencyId())));
+                    //修改金额表的今日金额
+                    //省级
+                    TShandeMch shandeMch3 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(order.getAgencyId())));
 
                     BigDecimal settleableBalance3 = shandeMch3.getSettleableBalance();
                     if(type==1){
-                        settleableBalance3 = settleableBalance3.add(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance3 = settleableBalance3.add(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
                     }
                     if(type == 3){
-                        settleableBalance3 = settleableBalance3.subtract(agencyTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance3 = settleableBalance3.subtract(agencyPrice).setScale(2, RoundingMode.HALF_DOWN);
                     }
-                shandeMch3.setSettleableBalance(settleableBalance3);
-                shandeMch3.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch3.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch3);
-                //市级
-;
-                TShandeMch shandeMch4 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getMerchantId())));
+                    shandeMch3.setSettleableBalance(settleableBalance3);
+                    shandeMch3.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch3.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch3);
+                    //市级
+                    TShandeMch shandeMch4 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(order.getMerchantId())));
                     BigDecimal settleableBalance4 =shandeMch4.getSettleableBalance();
                     if(type==1){
-                        settleableBalance4 = settleableBalance4.add(merchantTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance4 = settleableBalance4.add(merchantAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
                     if(type == 3){
-                        settleableBalance4 = settleableBalance4.subtract(merchantTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance4 = settleableBalance4.subtract(merchantAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
-                shandeMch4.setSettleableBalance(settleableBalance4);
-                shandeMch4.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch4.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch4);
-                //终端
-                TShandeMch shandeMch5 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getId())));
+                    shandeMch4.setSettleableBalance(settleableBalance4);
+                    shandeMch4.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch4.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch4);
+                    //终端
+                    TShandeMch shandeMch5 = R.getDataIfSuccess(szwlFeign.getShandeMch(String.valueOf(admin.getId())));
                     BigDecimal settleableBalance5 =shandeMch5.getSettleableBalance();
                     if(type==1){
-                        settleableBalance5 = settleableBalance5.add(personageTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance5 = settleableBalance5.add(personageAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
                     if(type == 3){
-                        settleableBalance5 = settleableBalance5.subtract(personageTotal).setScale(2, RoundingMode.HALF_DOWN);
+                        settleableBalance5 = settleableBalance5.subtract(personageAmount).setScale(2, RoundingMode.HALF_DOWN);
                     }
-                shandeMch5.setSettleableBalance(settleableBalance5);
-                shandeMch5.setTodayBalance(BigDecimal.valueOf(0));
-                shandeMch5.setModifyDate(new Date());
-                szwlFeign.updateShandeMch(shandeMch5);
+                    shandeMch5.setSettleableBalance(settleableBalance5);
+                    shandeMch5.setTodayBalance(BigDecimal.valueOf(0));
+                    shandeMch5.setModifyDate(new Date());
+                    szwlFeign.updateShandeMch(shandeMch5);
+                }
+
                 break;
         }