diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 5a05900ed..4b46ffc4b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -294,6 +294,23 @@ public class WxFinanceController extends BaseController { return new ResultData(map); } + @ApiOperation("增加临时付款费用") + @PostMapping("createTempToPay") + public ResultData createTempToPay(@RequestBody WxAllBill record) { + record.updateTenantInfo(getTenantInfo()); + if (StringUtils.isBlank(record.getReceivePay())) { + return new ResultData(Result.ERROR,"请填写金额"); + } + if (null == record.getEnergyFeesId()) { + return new ResultData(Result.ERROR,"请选择科目"); + } + if (null == record.getMerchantId()) { + return new ResultData(Result.ERROR,"请选择商户"); + } + wxFinanceService.createTempFees(record,this.getUser()); + return new ResultData(); + } + @GetMapping("receiveStatus") public ResultData receiveStatus() { List list = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 62820bf24..4b808e82d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -50,6 +50,7 @@ public interface WxFinanceService { //增加临时费用 void createTempFees(WxAllBill record,MallUserInfo user); + void createTempToPay(WxAllBill record,MallUserInfo user); //结账 PageInfo finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 90a45006c..3551738f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1084,22 +1084,34 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.setBillType(fees.getBillType()); WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE); + generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE,record.getReceivePay(),"0"); }else if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT); + generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,record.getReceivePay(),"0"); }else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.OTHER); + generateTempBill(record, merchant, user,EnumBillAllType.OTHER,record.getReceivePay(),"0"); } } - public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType) { + @Override + public void createTempToPay(WxAllBill record,MallUserInfo user) { + WxEnergyFees fees = wxEnergyService.getFeesById(record.getEnergyFeesId(),record.getTenantId()) ; + record.setBillType(fees.getBillType()); + WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); + if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { + generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,"0",record.getReceivePay()); + }else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { + generateTempBill(record, merchant, user,EnumBillAllType.OTHER,"0",record.getReceivePay()); + } + } + + public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType,String receivePay,String pay) { WxAllBill advanceBill = new WxAllBill(); advanceBill.updateTenantInfo(record); advanceBill.setMerchantId(merchant.getId()); advanceBill.setRentShopType(merchant.getRentShopType()); advanceBill.setNeedPay(record.getReceivePay()); - advanceBill.setReceivePay(record.getReceivePay()); - advanceBill.setPay("0"); + advanceBill.setReceivePay(receivePay); + advanceBill.setPay(pay); advanceBill.setUseMoney("0"); advanceBill.setBillType(billType.getCode()); //advanceBill.setPayWay();