|
@@ -185,7 +185,7 @@ public class IposFeignController extends BaseFeignController {
|
|
|
supplierTwo.setSplitId(records.getSplitId());
|
|
supplierTwo.setSplitId(records.getSplitId());
|
|
|
supplierTwo.setSourceId(2);
|
|
supplierTwo.setSourceId(2);
|
|
|
supplierTwo.setMerchantId(s);
|
|
supplierTwo.setMerchantId(s);
|
|
|
- for (SplitDetail detail : oneMaps.get(s)) {
|
|
|
|
|
|
|
+ for (SplitDetail detail : twoMaps.get(s)) {
|
|
|
supplierTwoAmount = supplierTwoAmount.add(new BigDecimal(detail.getConsignmentPrice()));
|
|
supplierTwoAmount = supplierTwoAmount.add(new BigDecimal(detail.getConsignmentPrice()));
|
|
|
detail.setPrice(detail.getPrice() - detail.getConsignmentPrice());
|
|
detail.setPrice(detail.getPrice() - detail.getConsignmentPrice());
|
|
|
}
|
|
}
|
|
@@ -204,7 +204,7 @@ public class IposFeignController extends BaseFeignController {
|
|
|
supplier.setSplitId(records.getSplitId());
|
|
supplier.setSplitId(records.getSplitId());
|
|
|
supplier.setSourceId(2);
|
|
supplier.setSourceId(2);
|
|
|
supplier.setMerchantId(s);
|
|
supplier.setMerchantId(s);
|
|
|
- for (SplitDetail detail : oneMaps.get(s)) {
|
|
|
|
|
|
|
+ for (SplitDetail detail : maps.get(s)) {
|
|
|
supplierAmount = supplierAmount.add(new BigDecimal(detail.getSettlementPrice()));
|
|
supplierAmount = supplierAmount.add(new BigDecimal(detail.getSettlementPrice()));
|
|
|
detail.setPrice(detail.getPrice() - detail.getSettlementPrice());
|
|
detail.setPrice(detail.getPrice() - detail.getSettlementPrice());
|
|
|
}
|
|
}
|