|
|
@@ -138,11 +138,6 @@ public class IposFeignController extends BaseFeignController {
|
|
|
}
|
|
|
|
|
|
SplitDetail detail = splitInfo.getDetails().get(0);
|
|
|
- //回写
|
|
|
- SplitPay sp = new SplitPay();
|
|
|
- sp.setOrderId(detail.getOrderId());
|
|
|
- sp.setSplitId(id);
|
|
|
- returnList.add(sp);
|
|
|
//区域运营商
|
|
|
if(detail.getIsSplitSupplier() && detail.getSupplierMoney() >0L){
|
|
|
SplitRecordsDetail supplier = new SplitRecordsDetail();
|
|
|
@@ -241,8 +236,15 @@ public class IposFeignController extends BaseFeignController {
|
|
|
VaultsResponse vaultsResponse = splitService.delayConfirm(records,details);
|
|
|
if(!vaultsResponse.validate()){
|
|
|
records.setComment(vaultsResponse.getMessage());
|
|
|
+ records.setStatus(3);
|
|
|
+ }else{
|
|
|
+ records.setStatus(2);
|
|
|
+ //回写
|
|
|
+ SplitPay sp = new SplitPay();
|
|
|
+ sp.setOrderId(detail.getOrderId());
|
|
|
+ sp.setSplitId(id);
|
|
|
+ returnList.add(sp);
|
|
|
}
|
|
|
- records.setStatus(2);
|
|
|
splitRecordsService.save(records);
|
|
|
splitRecordsDetailService.saveBatch(details);
|
|
|
}
|