diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/controller/MerBillController.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/controller/MerBillController.java index 4376e1e..94c5a50 100644 --- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/controller/MerBillController.java +++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/controller/MerBillController.java @@ -316,6 +316,7 @@ public class MerBillController extends BaseController { public R> importBillData(@RequestPart("file") MultipartFile file,AddBillBo bo) throws Exception { this.merBillService.validateSysSyd(bo); ExcelResult result = ExcelUtil.importExcel(file.getInputStream(),new BillImportListener(bo)); + ExcelUtil.importExcel(file.getInputStream(),new BillImportListener(bo)); for (MerBillDetailBo merBillDetailBo : result.getList()) { diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/MerBill.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/MerBill.java index 579f4cc..ad28f25 100644 --- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/MerBill.java +++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/MerBill.java @@ -69,6 +69,7 @@ public class MerBill extends BaseEntity { * 结算金额(分) */ private Long amountEnt; + private Long raise = 0L; /** * 账单状态(0:已提交,1:已接单 2:发放中 3:已发放:4:已撤消 5:已拒单) diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/vo/MerBillVo.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/vo/MerBillVo.java index efdd098..8b06ff1 100644 --- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/vo/MerBillVo.java +++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/vo/MerBillVo.java @@ -155,6 +155,7 @@ public class MerBillVo implements Serializable { @ExcelIgnore private Long money; + private Long raise; @ExcelProperty(value = "总金额") diff --git a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/service/impl/MerBillServiceImpl.java b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/service/impl/MerBillServiceImpl.java index 42a1fc1..28244f4 100644 --- a/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/service/impl/MerBillServiceImpl.java +++ b/ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/service/impl/MerBillServiceImpl.java @@ -769,6 +769,7 @@ public class MerBillServiceImpl extends BaseService implements IMerBillService { bo.setOpNo(busOperAndAgentAndMer.getOpNo()); MerBill add = BeanUtil.copyProperties(bo, MerBill.class); + add.setId(null); add.setVerifyStatus(1L); add.setMoney(0l); add.setServiceChargeAmount(0l); @@ -777,6 +778,7 @@ public class MerBillServiceImpl extends BaseService implements IMerBillService { for (MerBillDetailBo detail: bo.getDetails()) { add.setMoney(add.getMoney()+detail.getMoney()); + add.setRaise(add.getRaise()+detail.getRaise()); add.setServiceChargeAmount(add.getServiceChargeAmount()+detail.getServiceChargeMoney()); add.setAmountEnt(add.getAmountEnt()+detail.getServiceChargeMoney()+detail.getAmount()); add.setDetailCount(add.getDetailCount()+1); diff --git a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/bill/MerBillMapper.xml b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/bill/MerBillMapper.xml index 6e0efd6..edc3a4e 100644 --- a/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/bill/MerBillMapper.xml +++ b/ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/bill/MerBillMapper.xml @@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t.`max_month`, t.`invoice_type`, t.`charge_mode`, - t3.name taskName + t3.name taskName, + t.raise