站长分成

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

@@ -1,6 +1,7 @@
 package com.poteviohealth.ym.ipos.controller.feign;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
 import com.poteviohealth.cgp.common.controller.BaseFeignController;
@@ -18,6 +19,7 @@ import com.poteviohealth.ym.ipos.service.*;
 import com.poteviohealth.ym.ipos.utils.YmUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
@@ -39,6 +41,7 @@ import java.util.List;
 @Controller
 @RequestMapping("/ipos/feign")
 @Api(tags = {"第三方-支付相关接口"})
+@Log4j2
 public class IposFeignController extends BaseFeignController {
 
     @Resource
@@ -109,6 +112,7 @@ public class IposFeignController extends BaseFeignController {
          * 站长分账 = 剩余分账 * 分账比例
          * 平台运营商分账 = 可分账 - 区域运营商分账 -团长分账 -站长分账
          */
+        log.info(JSON.toJSONString(list));
         BigDecimal proportion = new BigDecimal(0.01);
         List<SplitPay> returnList = Lists.newArrayList();
         for (SplitInfo splitInfo : list) {
@@ -251,6 +255,7 @@ public class IposFeignController extends BaseFeignController {
                      * 3.分成
                      */
                     //区域运营商
+                    log.info("detail.getSupplierMoney()==="+detail.getSupplierMoney());
                     if(detail.getSupplierMoney()!= null && detail.getSupplierMoney()>0L){
                         SplitRecordsDetail supplier = new SplitRecordsDetail();
                         supplier.setSplitId(records.getSplitId());
@@ -275,7 +280,7 @@ public class IposFeignController extends BaseFeignController {
                     }
 
                     //团长
-                    if(detail.getGroupCommissionMoney() != null && detail.getGroupCommissionMoney()>0L){
+                    if(detail.getGroupCommissionMoney() != null && detail.getGroupCommissionMoney()>0L &&StringUtils.isNotBlank(detail.getGroupLeaderMerchantId())){
                         SplitRecordsDetail tz = new SplitRecordsDetail();
                         tz.setSplitId(records.getSplitId());
                         tz.setSourceId(6);
@@ -298,12 +303,12 @@ public class IposFeignController extends BaseFeignController {
                         }
                     }
                     //站长
-                    if(detail.getStationmasterCommissionMoney() != null && detail.getStationmasterCommissionMoney()>0L){
+                    if(detail.getStationmasterCommissionMoney() != null && detail.getStationmasterCommissionMoney()>0L&&StringUtils.isNotBlank(detail.getStationmasterMerchantId())){
                         SplitRecordsDetail station = new SplitRecordsDetail();
                         station.setSplitId(records.getSplitId());
                         station.setSourceId(5);
                         station.setMerchantId(detail.getStationmasterMerchantId());
-                        boolean is_have = false;
+                        Boolean is_have = false;
                         for (SplitRecordsDetail splitRecordsDetail : details) {
                             if(splitRecordsDetail.getMerchantId().equals(detail.getStationmasterMerchantId())){
                                 station = splitRecordsDetail;