|
|
@@ -114,9 +114,6 @@ public class IposFeignController extends BaseFeignController {
|
|
|
records.setPayId(splitInfo.getPayId());
|
|
|
records.setPaySn(splitInfo.getPaySn());
|
|
|
records.setSumPrice(splitInfo.getSumPrice());
|
|
|
- SplitPay sp = new SplitPay();
|
|
|
- sp.setPayId(records.getPayId());
|
|
|
- sp.setSplitId(records.getSplitId());
|
|
|
//平台分成
|
|
|
SplitRecordsDetail pt = new SplitRecordsDetail();
|
|
|
pt.setSplitId(records.getSplitId());
|
|
|
@@ -134,6 +131,9 @@ public class IposFeignController extends BaseFeignController {
|
|
|
tz.setSourceId(3);
|
|
|
|
|
|
for (SplitDetail detail : splitInfo.getDetails()) {
|
|
|
+ SplitPay sp = new SplitPay();
|
|
|
+ sp.setOrderId(detail.getOrderId());
|
|
|
+ sp.setSplitId(records.getSplitId());
|
|
|
//运算价格
|
|
|
BigDecimal price = new BigDecimal(detail.getPrice()).multiply(proportion);
|
|
|
|
|
|
@@ -154,6 +154,7 @@ public class IposFeignController extends BaseFeignController {
|
|
|
tzAmount = tzAmount.add(tbd);
|
|
|
}
|
|
|
detail.setPrice(price.longValue());
|
|
|
+ returnList.add(sp);
|
|
|
}
|
|
|
pt.setDivAmt(String.valueOf(ptAmount.longValue()));
|
|
|
details.add(pt);
|
|
|
@@ -238,7 +239,6 @@ public class IposFeignController extends BaseFeignController {
|
|
|
splitRecordsList.add(records);
|
|
|
splitRecordsService.saveBatch(splitRecordsList);
|
|
|
splitRecordsDetailService.saveBatch(details);
|
|
|
- returnList.add(sp);
|
|
|
}
|
|
|
return VaultsResponse.success(returnList);
|
|
|
}
|