分账

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

@@ -257,7 +257,7 @@ public class IposFeignController extends BaseFeignController {
 
                 Boolean supplierNotHave = true;
                 for (SplitRecordsDetail detail : details) {
-                    if(detail.getMerchantId().equals(s)){
+                    if(detail.getMerchantId()!= null &&detail.getMerchantId().equals(s)){
                         supplier = detail;
                         supplier.setDivAmt(String.valueOf(supplierAmount.longValue()));
                         supplierNotHave = false;
@@ -303,7 +303,7 @@ public class IposFeignController extends BaseFeignController {
 
                 Boolean stationNotHave = true;
                 for (SplitRecordsDetail detail : details) {
-                    if(detail.getMerchantId().equals(s)){
+                    if(detail.getMerchantId()!= null && detail.getMerchantId().equals(s)){
                         station = detail;
                         station.setDivAmt(String.valueOf(stationAmount.longValue()));
                         stationNotHave = false;