From eec06f082d304c3f930bbfca72cd528c142421fe Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 31 三月 2025 12:35:52 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 3 +++
ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index a596a85..b8e6ddc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -301,6 +301,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
+ save.setBusinessDeptId(bill.getBusinessDeptId());
save.setPayTime(bankflow.getPayTime());
save.setSysSerialNumber(OrderNos.getDid(30));
save.setBankSerialNumber(bankflow.getBankSerialNumber());
@@ -382,6 +383,7 @@
TFlowManagement saveFlow = new TFlowManagement();
saveFlow.setPayType(1);
saveFlow.setPayer(order.getUserId());
+ saveFlow.setBusinessDeptId(bill.getBusinessDeptId());
saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
saveFlow.setSysSerialNumber(OrderNos.getDid(30));
saveFlow.setBankSerialNumber(save.getPayNo());
@@ -549,6 +551,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
+ save.setBusinessDeptId(bill.getBusinessDeptId());
save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
save.setSysSerialNumber(OrderNos.getDid());
save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
index 50011ed..9e1bbcc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml
@@ -62,8 +62,8 @@
<if test="query.userId != null and query.userId !=''">
and t.id = #{query.userId}
</if>
- <if test="query.businessDeptId != null and query.businessDeptId !=''">
- and b.business_dept_id = #{businessDeptId}
+ <if test='query.businessDeptId != null and query.businessDeptId != "" and query.businessDeptId!="0"'>
+ and b.business_dept_id = #{query.businessDeptId}
</if>
<if test="query.billType != null">
and b.bill_type = #{query.billType}
--
Gitblit v1.7.1