分成

src/main/java/com/poteviohealth/ym/ipos/controller/feign/IposFeignController.java

@@ -145,23 +145,12 @@ public class IposFeignController extends BaseFeignController {
                 }
                 price = price.subtract(valDecimal);
                 ptAmount = ptAmount.add(valDecimal);
-
-                //团长金额
-                if (StringUtil.isNotEmpty(detail.getGroupLeaderMerchantId())) {
-                    tz.setMerchantId(detail.getGroupLeaderMerchantId());
-                    BigDecimal tbd = detail.getGroupCommission().multiply(new BigDecimal(detail.getPrice()));
-                    price = price.subtract(tbd);
-                    tzAmount = tzAmount.add(tbd);
-                }
                 detail.setPrice(price.longValue());
                 returnList.add(sp);
             }
             pt.setDivAmt(String.valueOf(ptAmount.longValue()));
             details.add(pt);
-            if (tzAmount.compareTo(BigDecimal.ZERO) == 1) {
-                tz.setDivAmt(String.valueOf(tzAmount.longValue()));
-                details.add(tz);
-            }
+
 
             //一级供应商
             Map<String, List<SplitDetail>> oneMaps = splitInfo.getDetails().stream().filter(s -> StringUtils.isNotEmpty(s.getSupplierOneMerchantId()) && s.getBelong().equals(1)).collect(Collectors.groupingBy(SplitDetail::getSupplierOneMerchantId));
@@ -221,6 +210,21 @@ public class IposFeignController extends BaseFeignController {
                 }
             }
 
+            for (SplitDetail detail : splitInfo.getDetails()) {
+                //团长金额
+                if (StringUtil.isNotEmpty(detail.getGroupLeaderMerchantId())) {
+                    tz.setMerchantId(detail.getGroupLeaderMerchantId());
+                    BigDecimal tbd = detail.getGroupCommission().multiply(new BigDecimal(detail.getPrice()));
+                    detail.setPrice(detail.getPrice()-tbd.longValue());
+                    tzAmount = tzAmount.add(tbd);
+                }
+            }
+            if (tzAmount.compareTo(BigDecimal.ZERO) == 1) {
+                tz.setDivAmt(String.valueOf(tzAmount.longValue()));
+                details.add(tz);
+            }
+
+
             //平台运营商
             SplitRecordsDetail ptyys = new SplitRecordsDetail();
             ptyys.setSplitId(records.getSplitId());