cy/linggong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：1>个税;

Browse Source
This commit is contained in:
liu
2025-07-18 01:01:56 +08:00
parent 9b4c2a808e
commit f6edadcd8b
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/controller/MerBillController.java
View File

@ -316,6 +316,7 @@ public class MerBillController extends BaseController {
public R<ExcelResult<MerBillDetailBo>> importBillData(@RequestPart("file") MultipartFile file,AddBillBo bo) throws Exception { public R<ExcelResult<MerBillDetailBo>> importBillData(@RequestPart("file") MultipartFile file,AddBillBo bo) throws Exception {
this.merBillService.validateSysSyd(bo); this.merBillService.validateSysSyd(bo);
ExcelResult<MerBillDetailBo> result = ExcelUtil.importExcel(file.getInputStream(),new BillImportListener(bo)); ExcelResult<MerBillDetailBo> result = ExcelUtil.importExcel(file.getInputStream(),new BillImportListener(bo));
ExcelUtil.importExcel(file.getInputStream(),new BillImportListener(bo));
for (MerBillDetailBo merBillDetailBo : result.getList()) { for (MerBillDetailBo merBillDetailBo : result.getList()) {

1
ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/MerBill.java
View File

@ -69,6 +69,7 @@ public class MerBill extends BaseEntity {
* 结算金额（分） * 结算金额（分）
*/ */
private Long amountEnt; private Long amountEnt;
private Long raise = 0L;
/** /**
* 账单状态（0:已提交，1:已接单 2:发放中 3:已发放：4：已撤消 5:已拒单） * 账单状态（0:已提交，1:已接单 2:发放中 3:已发放：4：已撤消 5:已拒单）

1
ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/domain/vo/MerBillVo.java
View File

@ -155,6 +155,7 @@ public class MerBillVo implements Serializable {
@ExcelIgnore @ExcelIgnore
private Long money; private Long money;
private Long raise;
@ExcelProperty(value = "总金额") @ExcelProperty(value = "总金额")

2
ruoyi-modules/ruoyi-payment/src/main/java/org/dromara/payment/bill/service/impl/MerBillServiceImpl.java
View File

@ -769,6 +769,7 @@ public class MerBillServiceImpl extends BaseService implements IMerBillService {
bo.setOpNo(busOperAndAgentAndMer.getOpNo()); bo.setOpNo(busOperAndAgentAndMer.getOpNo());
MerBill add = BeanUtil.copyProperties(bo, MerBill.class); MerBill add = BeanUtil.copyProperties(bo, MerBill.class);
add.setId(null);
add.setVerifyStatus(1L); add.setVerifyStatus(1L);
add.setMoney(0l); add.setMoney(0l);
add.setServiceChargeAmount(0l); add.setServiceChargeAmount(0l);
@ -777,6 +778,7 @@ public class MerBillServiceImpl extends BaseService implements IMerBillService {
for (MerBillDetailBo detail: for (MerBillDetailBo detail:
bo.getDetails()) { bo.getDetails()) {
add.setMoney(add.getMoney()+detail.getMoney()); add.setMoney(add.getMoney()+detail.getMoney());
add.setRaise(add.getRaise()+detail.getRaise());
add.setServiceChargeAmount(add.getServiceChargeAmount()+detail.getServiceChargeMoney()); add.setServiceChargeAmount(add.getServiceChargeAmount()+detail.getServiceChargeMoney());
add.setAmountEnt(add.getAmountEnt()+detail.getServiceChargeMoney()+detail.getAmount()); add.setAmountEnt(add.getAmountEnt()+detail.getServiceChargeMoney()+detail.getAmount());
add.setDetailCount(add.getDetailCount()+1); add.setDetailCount(add.getDetailCount()+1);

3
ruoyi-modules/ruoyi-payment/src/main/resources/mapper/payment/bill/MerBillMapper.xml
View File

@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
t.`max_month`, t.`max_month`,
t.`invoice_type`, t.`invoice_type`,
t.`charge_mode`, t.`charge_mode`,
t3.name taskName t3.name taskName,
t.raise
</sql> </sql>
<sql id="sqlBillList"> <sql id="sqlBillList">