站长分成

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

@@ -204,8 +204,8 @@ public class IposFeignController extends BaseFeignController {
 
                     }
                 }else if(detail.getBelong().equals(0)){
-                    //服务站
-                    if(StringUtils.isNotEmpty(detail.getServiceStationMerchantId()) && detail.getOrderType().equals(2)){
+                    //服务商
+                    if(StringUtils.isNotEmpty(detail.getServiceStationMerchantId()) && detail.getOrderType().equals(2) && !detail.getServiceStationId().equals(detail.getStationId())){
                         SplitRecordsDetail serviceStation = new SplitRecordsDetail();
                         serviceStation.setSplitId(records.getSplitId());
                         serviceStation.setSourceId(5);
@@ -227,36 +227,37 @@ public class IposFeignController extends BaseFeignController {
                             }
 
                         }
-                    }else if(StringUtils.isNotEmpty(detail.getSupplierMerchantId()) && detail.getOrderType().equals(1)){
+                    }else if(StringUtils.isNotEmpty(detail.getSupplierMerchantId())){
                         //供应商
-                        boolean is_have = false;
-                        SplitRecordsDetail supplier = new SplitRecordsDetail();
-                        supplier.setSplitId(records.getSplitId());
-                        supplier.setSourceId(2);
-                        supplier.setMerchantId(detail.getSupplierMerchantId());
-                        for (SplitRecordsDetail splitRecordsDetail : details) {
-                            if(splitRecordsDetail.getMerchantId().equals(detail.getSupplierMerchantId())){
-                                supplier = splitRecordsDetail;
-                                is_have =true;
-                                break;
+                        if(detail.getOrderType().equals(1) ||(detail.getOrderType().equals(2)&&detail.getStationId().equals(detail.getServiceStationId()))){
+                            boolean is_have = false;
+                            SplitRecordsDetail supplier = new SplitRecordsDetail();
+                            supplier.setSplitId(records.getSplitId());
+                            supplier.setSourceId(2);
+                            supplier.setMerchantId(detail.getSupplierMerchantId());
+                            for (SplitRecordsDetail splitRecordsDetail : details) {
+                                if(splitRecordsDetail.getMerchantId().equals(detail.getSupplierMerchantId())){
+                                    supplier = splitRecordsDetail;
+                                    is_have =true;
+                                    break;
+                                }
                             }
-                        }
-                        supplierAmount = supplierAmount.add(new BigDecimal(detail.getSettlementPrice()));
-                        detail.setPrice(detail.getPrice()-detail.getSettlementPrice());
-                        if (supplierAmount.compareTo(BigDecimal.ZERO) == 1) {
-                            supplier.setDivAmt(supplierAmount.toString());
-                            if(!is_have){
-                                details.add(supplier);
+                            supplierAmount = supplierAmount.add(new BigDecimal(detail.getSettlementPrice()));
+                            detail.setPrice(detail.getPrice()-detail.getSettlementPrice());
+                            if (supplierAmount.compareTo(BigDecimal.ZERO) == 1) {
+                                supplier.setDivAmt(supplierAmount.toString());
+                                if(!is_have){
+                                    details.add(supplier);
+                                }
                             }
-
                         }
+
                     }
                 }
                     /**
                      * 3.分成
                      */
                     //区域运营商
-                    log.info("detail.getSupplierMoney()==="+detail.getSupplierMoney());
                     if(detail.getSupplierMoney()!= null && detail.getSupplierMoney()>0L){
                         SplitRecordsDetail supplier = new SplitRecordsDetail();
                         supplier.setSplitId(records.getSplitId());