renkang/zhst-finance-model
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新功能及bug修改

Browse Source
This commit is contained in:
hejiayang
2025-12-06 20:13:50 +08:00
parent a9128bcc60
commit 4614ed1f19
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
+9 -4
View File
@@ -141,6 +141,7 @@
LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
</if>
LEFT JOIN sys_user_sub AS c ON a.member_id = c.id
LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id
WHERE a.is_del = 0
<if test="vo.startTime != null and vo.endTime !=''">
<choose>
@@ -175,7 +176,9 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
</if>
<if test="vo.userName != null and vo.userName != ''">
and c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
)
</if>
<if test="vo.canteenId != null and vo.canteenId != ''">
and a.canteen_id = #{vo.canteenId}
@@ -191,8 +194,7 @@
a.id,
a.serial_no as serialNo,
a.order_no as orderNo,
c.realname as userName,
IF(a.member_id = a.pay_member_id,pay.realname,CONCAT(pay.realname,'-',c.realname)) as userName,
c.phone,
c.work_no as workNo,
a.status,
@@ -211,6 +213,7 @@
LEFT JOIN st_bbzx_order_info sboi ON a.order_no = sboi.order_no
</if>
LEFT JOIN sys_user_sub AS c ON a.member_id = c.id
LEFT JOIN sys_user_sub AS pay ON a.pay_member_id = pay.id
WHERE a.is_del = 0
<if test="vo.startTime != null and vo.endTime !=''">
<choose>
@@ -245,7 +248,9 @@
and c.work_no like CONCAT('%',#{vo.workNo,jdbcType=VARCHAR},'%')
</if>
<if test="vo.userName != null and vo.userName != ''">
and c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
and (c.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%') or
pay.realname like CONCAT('%',#{vo.userName,jdbcType=VARCHAR},'%')
)
</if>
<if test="vo.canteenId != null and vo.canteenId != ''">
and a.canteen_id = #{vo.canteenId}
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberLevelDeductRuleServiceImpl.java
+4
View File
@@ -421,6 +421,10 @@ public class StClientMemberLevelDeductRuleServiceImpl extends JeecgServiceImpl<S
if(CollectionUtils.isEmpty(voListAll)){
return Result.error("扣费信息不能为空");
}
voListAll.forEach(vo -> {
vo.setRestId(restId);
vo.setDeviceCode(deviceCode);
});
// //去重
// voListAll = filterDuplicateTimestamp(voListAll);
//数据预处理: 一人 一餐 除二次扣费外 只有一条扣费数据