三方支付

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

@@ -128,7 +128,7 @@ public class IposFeignController extends BaseFeignController {
             pt.setDivAmt(String.valueOf(splitInfo.getSelfCommissionMoney()));
             details.add(pt);
             //平台运营商
-            if(splitInfo.getIsSplitOperator()){
+            if(splitInfo.getIsSplitOperator() && splitInfo.getOperatorCommissionMoney() >0L){
                 SplitRecordsDetail ptyys = new SplitRecordsDetail();
                 ptyys.setSplitId(id);
                 ptyys.setSourceId(1);
@@ -144,21 +144,19 @@ public class IposFeignController extends BaseFeignController {
             sp.setSplitId(id);
             returnList.add(sp);
             //区域运营商
-            if(detail.getIsSplitSupplier()){
-                if(detail.getSupplierMoney()>0L){
-                    SplitRecordsDetail supplier = new SplitRecordsDetail();
-                    supplier.setSplitId(id);
-                    supplier.setSourceId(2);
-                    supplier.setMerchantId(detail.getSupplierMerchantId());
-                    supplier.setDivAmt(detail.getSupplierMoney().toString());
-                    details.add(supplier);
-                }
+            if(detail.getIsSplitSupplier() && detail.getSupplierMoney() >0L){
+               SplitRecordsDetail supplier = new SplitRecordsDetail();
+               supplier.setSplitId(id);
+               supplier.setSourceId(2);
+               supplier.setMerchantId(detail.getSupplierMerchantId());
+               supplier.setDivAmt(detail.getSupplierMoney().toString());
+               details.add(supplier);
             }
 
             //供应商
             if(detail.getBelong().equals(1)){
                 //一级供应商
-                if(detail.getIsSplitSupplierOne()){
+                if(detail.getIsSplitSupplierOne() && detail.getConsignmentPrice() >0L){
                     SplitRecordsDetail supplierOne = new SplitRecordsDetail();
                     supplierOne.setSplitId(id);
                     supplierOne.setSourceId(3);
@@ -168,7 +166,7 @@ public class IposFeignController extends BaseFeignController {
                 }
             }else if(detail.getBelong().equals(2)){
                 //二级供应商
-                if(detail.getIsSplitServiceStation()){
+                if(detail.getIsSplitServiceStation() && detail.getConsignmentPrice() >0L){
                     SplitRecordsDetail supplierTwo = new SplitRecordsDetail();
                     supplierTwo.setSplitId(id);
                     supplierTwo.setSourceId(4);
@@ -179,7 +177,7 @@ public class IposFeignController extends BaseFeignController {
             }else{
                 //服务商
                 if(detail.getOrderType().equals(2) && !detail.getServiceStationId().equals(detail.getStationId())){
-                    if(detail.getIsSplitServiceStation()){
+                    if(detail.getIsSplitServiceStation() && detail.getSettlementPrice() >0L){
                         SplitRecordsDetail serviceStation = new SplitRecordsDetail();
                         serviceStation.setSplitId(id);
                         serviceStation.setSourceId(5);
@@ -203,14 +201,14 @@ public class IposFeignController extends BaseFeignController {
                             break;
                         }
                     }
-                    if(!isHave){
+                    if(!isHave && detail.getSettlementPrice() >0L){
                         details.add(supplier);
                     }
                 }
             }
 
             //团长
-            if(detail.getIsSplitGroupLeader()){
+            if(detail.getIsSplitGroupLeader() && detail.getGroupCommissionMoney() >0L){
                 SplitRecordsDetail tz = new SplitRecordsDetail();
                 tz.setSplitId(id);
                 tz.setSourceId(6);
@@ -219,7 +217,7 @@ public class IposFeignController extends BaseFeignController {
                 details.add(tz);
             }
             //站长
-            if(detail.getIsSplitStation()){
+            if(detail.getIsSplitStation() && detail.getStationmasterCommissionMoney()>0L){
                 SplitRecordsDetail station = new SplitRecordsDetail();
                 station.setSplitId(id);
                 station.setSourceId(5);

src/main/java/com/poteviohealth/ym/ipos/service/impl/SplitServiceImpl.java

@@ -72,7 +72,9 @@ public class SplitServiceImpl implements ISplitService {
             SplitListConfirm slc = new SplitListConfirm();
             slc.setMerchant_id(recordsDetail.getMerchantId());
             slc.setDiv_amt(recordsDetail.getDivAmt());
-            list.add(slc);
+            if(!slc.getDiv_amt().equals("0")){
+                list.add(slc);
+            }
         }
 
         splitInfoConfirm.setKeep_amt(amt);