From f48d94227bb9054ef3620329eb8e0b192df46d15 Mon Sep 17 00:00:00 2001 From: fansongsong <1103393971@qq.com> Date: Fri, 26 Dec 2025 18:32:05 +0800 Subject: [PATCH] =?UTF-8?q?1:=E8=B0=83=E6=95=B4=E6=B5=81=E6=B0=B4=E6=98=8E?= =?UTF-8?q?=E7=BB=86-=E7=BB=9F=E8=AE=A1+=E5=AF=BC=E5=87=BA=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=BB=9F=E4=B8=80?= =?UTF-8?q?sql=202:=E4=B8=AA=E4=BA=BA=E6=B6=88=E8=B4=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=B3=E8=81=94sys=5Fuser=5Fsub=E4=BD=BF?= =?UTF-8?q?=E7=94=A8LEFT=20JOIN=E8=A7=A3=E5=86=B3=E5=92=8C=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E6=98=8E=E7=BB=86=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98=203=EF=BC=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E7=94=9F=E6=88=90=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E9=81=BF=E5=85=8D=E5=B9=B6=E5=8F=91=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StClientMemberBalanceController.java | 8 +++---- .../jeecg/payment/listUtils/OrderUtils.java | 21 ++++--------------- ...StClientMemberTransactionRecordMapper.java | 2 +- .../mapper/xml/StBbzxOrderInfoMapper.xml | 4 ++-- .../StClientMemberTransactionRecordMapper.xml | 2 +- ...tClientMemberTransactionRecordService.java | 8 +++++++ .../impl/StBbzxOrderInfoServiceImpl.java | 5 +++-- ...entMemberTransactionRecordServiceImpl.java | 19 +++++++++++++++++ 8 files changed, 42 insertions(+), 27 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java index 82d6621..4f95e9f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java @@ -483,8 +483,8 @@ public class StClientMemberBalanceController { } } query.setCanteenIdList(canteenIdList); - query.setStatus(1);//消费=101 - List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); + query.setStatus(101); + List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额 @@ -523,8 +523,8 @@ public class StClientMemberBalanceController { } } query.setCanteenIdList(canteenIdList); - query.setStatus(1);//消费=101 - List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); + query.setStatus(101); + List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java index afda1f4..2b06d43 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java @@ -1,9 +1,12 @@ package org.jeecg.payment.listUtils; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; +import java.util.UUID; /** * * 订单编码码生成器，生成32位数字编码， @@ -107,26 +110,10 @@ public class OrderUtils { */ public static String getOrderCodeV2() { - return ORDER_CODE + getDateTimeV2(); + return getDateTime() + IdWorker.get32UUID(); } - /** - * 生成退货单号编码（调用方法） - * @param userId 网站中该用户唯一ID 防止重复 - */ - public static String getReturnCode(Integer userId) { - return RETURN_ORDER + getCode(userId); - } - - - /** - * 生成退款单号编码(调用方法) - * @param userId 网站中该用户唯一ID 防止重复 - */ - public static String getRefundCode(Integer userId) { - return REFUND_ORDER + getCode(userId); - } } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java index 5f06025..ab5ce1e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java @@ -25,7 +25,7 @@ public interface StClientMemberTransactionRecordMapper extends BaseMapper pageList2(Page page, @Param("vo") StClientMemberTransactionRecordDTO query); - + List pageList2( @Param("vo") StClientMemberTransactionRecordDTO query); /** * 列表查询 * @return diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml index 3926afe..372e596 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml @@ -309,8 +309,8 @@ ) AS totalNum FROM st_bbzx_order_info oi - JOIN sys_user_sub u ON oi.member_id = u.id - JOIN sys_user_sub pay ON oi.pay_member_id = pay.id + LEFT JOIN sys_user_sub u ON oi.member_id = u.id + LEFT JOIN sys_user_sub pay ON oi.pay_member_id = pay.id LEFT JOIN st_base_restaurant AS sr ON sr.id = oi.canteen_id LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0' LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0' diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml index 805f33c..eb89388 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml @@ -200,7 +200,7 @@