From 8764dae833b80c370f1688daa03f07ee2e272d11 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 3 Jul 2025 09:14:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?6651=20=E8=B4=A6=E6=88=B7=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=BC=BA=E5=B0=91=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=A1=A3=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/account/domain/vo/AccConsumeDetailVO.java | 5 +++++ .../src/main/resources/mapper/account/AccTradeMapper.xml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java index e2ef94d..e26c3c9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java @@ -64,4 +64,9 @@ public class AccConsumeDetailVO implements Serializable { * 来源类型 */ private Integer sourceType; + + /** + * 订单编号 + */ + private String stallName; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml index 1e2a6b3..f447477 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml @@ -312,9 +312,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" atwd.wallet_type, atwd.amount, atwd.wallet_bal, - oi.source_type + oi.source_type, + bs.stall_name from order_info oi + left join basic_stall bs on + oi.stall_id = bs.stall_id inner join account_trade at2 on oi.order_id = at2.order_no inner join account_trade_wallet_detail atwd on @@ -323,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" oi.user_id = su.user_id inner join sys_dept sd on su.dept_id = sd.dept_id + where atwd.trade_type in (110, 120, 130) and oi.order_state in (1, 2, 3) From ca1d10ff9263f0c56acb0fd0c61baa4ea426ef0f Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 3 Jul 2025 11:12:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?6618=20=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=AD=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=BC=A0?= =?UTF-8?q?=E8=BE=93=E6=9C=AA=E5=8A=A0=E5=AF=86=206620=20=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=BC=A0=E8=BE=93=E6=9C=AA=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=206622=20=E9=92=B1=E5=8C=85=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E6=9C=AA=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AccInfoServiceImpl.java | 18 +++++++++--------- .../impl/AccOperationHistoryServiceImpl.java | 10 +++++----- .../service/impl/AccSubServiceImpl.java | 13 +++++++------ .../service/impl/AccTradeServiceImpl.java | 10 +++++----- .../KitchenStaffMorningCheckServiceImpl.java | 10 +++++----- .../service/impl/OrderInfoServiceImpl.java | 3 ++- .../service/impl/AccReportServiceImpl.java | 10 +++++----- .../service/impl/TradeReportServiceImpl.java | 10 +++++----- 8 files changed, 43 insertions(+), 41 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index d69cb9d..cd7c9a7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -255,10 +255,10 @@ public class AccInfoServiceImpl implements IAccInfoService { if (CollUtil.isEmpty(list)) { return; } - list = list.stream().peek(item -> { - String decryptedPhoneNumber = SM4EncryptUtils.sm4Decrypt(item.getPhoneNumber()); - item.setPhoneNumber(decryptedPhoneNumber); - }).collect(Collectors.toList()); +// list = list.stream().peek(item -> { +// String decryptedPhoneNumber = SM4EncryptUtils.sm4Decrypt(item.getPhoneNumber()); +// item.setPhoneNumber(decryptedPhoneNumber); +// }).collect(Collectors.toList()); List custIdList = list.stream() .map(AccInfoDetailsVO::getUserId) .collect(Collectors.toList()); @@ -468,11 +468,11 @@ public class AccInfoServiceImpl implements IAccInfoService { @Override public List queryAccPersonalWalOperationAddList(AccWalletOperationQueryParam param) { List operationListVOList = accTradeService.queryAccOperationList(param); - if(CollUtil.isNotEmpty(operationListVOList)) { - for(AccOperationListVO vo: operationListVOList) { - vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); - } - } +// if(CollUtil.isNotEmpty(operationListVOList)) { +// for(AccOperationListVO vo: operationListVOList) { +// vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); +// } +// } return operationListVOList ; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java index 9415bbb..be8328d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java @@ -29,11 +29,11 @@ public class AccOperationHistoryServiceImpl extends ServiceImpl selectAccOperationHistory(AccOperationQueryParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); List operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue); - if(CollUtil.isNotEmpty(operationRecordList)) { - for(AccountInfoHistoryVO history : operationRecordList) { - history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone())); - } - } +// if(CollUtil.isNotEmpty(operationRecordList)) { +// for(AccountInfoHistoryVO history : operationRecordList) { +// history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone())); +// } +// } return operationRecordList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java index bb8341c..0887696 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java @@ -361,7 +361,8 @@ public class AccSubServiceImpl implements AccSubService { errVO.setNickName(accInfo.getNickName()); errVO.setDeptFullName(accInfo.getDeptFullName()); errVO.setUserType(accInfo.getUserType()); - errVO.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(accInfo.getPhoneNumber())); +// errVO.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(accInfo.getPhoneNumber())); + errVO.setPhoneNumber(accInfo.getPhoneNumber()); errVO.setAmount(amount); errVO.setErrorMessage(errMsg); return errVO; @@ -369,11 +370,11 @@ public class AccSubServiceImpl implements AccSubService { @Override public List queryAccSubOperationList(AccWalletOperationQueryParam param) { List operationListVOList = accTradeService.queryAccOperationList(param); - if(CollUtil.isNotEmpty(operationListVOList)) { - for(AccOperationListVO vo: operationListVOList) { - vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); - } - } +// if(CollUtil.isNotEmpty(operationListVOList)) { +// for(AccOperationListVO vo: operationListVOList) { +// vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); +// } +// } return operationListVOList ; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java index 283a99f..40c2777 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java @@ -153,11 +153,11 @@ public class AccTradeServiceImpl implements IAccTradeService { public List queryAccOperationList(AccWalletOperationQueryParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); List list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue); - if(CollUtil.isNotEmpty(list)) { - for(AccOperationListVO vo : list) { - vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); - } - } +// if(CollUtil.isNotEmpty(list)) { +// for(AccOperationListVO vo : list) { +// vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); +// } +// } return list; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffMorningCheckServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffMorningCheckServiceImpl.java index bb013f9..bb59874 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffMorningCheckServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffMorningCheckServiceImpl.java @@ -46,11 +46,11 @@ public class KitchenStaffMorningCheckServiceImpl implements IKitchenStaffMorning kitchenStaffMorningCheck.setEncryptedSearchValue(encryptedSearchValue); List kitchenStaffMorningCheckList = kitchenStaffMorningCheckMapper .selectKitchenStaffMorningCheckList(kitchenStaffMorningCheck); - if(CollUtil.isNotEmpty(kitchenStaffMorningCheckList)) { - kitchenStaffMorningCheckList.forEach(value -> { - value.setMobile(SM4EncryptUtils.sm4Decrypt(value.getMobile())); - }); - } +// if(CollUtil.isNotEmpty(kitchenStaffMorningCheckList)) { +// kitchenStaffMorningCheckList.forEach(value -> { +// value.setMobile(SM4EncryptUtils.sm4Decrypt(value.getMobile())); +// }); +// } return kitchenStaffMorningCheckList; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java index 33dad16..74906e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java @@ -130,7 +130,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService orderDetail.setOrderId(order.getOrderId()); List orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); order.setOrderDetailList(orderDetailList); - order.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(order.getPhoneNumber())); +// order.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(order.getPhoneNumber())); + order.setPhoneNumber(order.getPhoneNumber()); order.setDeliveryTypeName(DeliveryTypeEnum.getDescByKey(order.getDeliveryType())); }); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java index 00ad957..93719d4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java @@ -49,11 +49,11 @@ public class AccReportServiceImpl implements AccReportService { public List selectUserIncomeOutcome(UserIncomeOutcomeParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); List list = accReportMapper.selectUserIncomeOutcome(param, encryptedSearchValue); - if(CollUtil.isNotEmpty(list)) { - for (UserIncomeOutcomeVO userIncomeOutcomeVO : list) { - userIncomeOutcomeVO.setPhonenumber(SM4EncryptUtils.sm4Decrypt(userIncomeOutcomeVO.getPhonenumber())); - } - } +// if(CollUtil.isNotEmpty(list)) { +// for (UserIncomeOutcomeVO userIncomeOutcomeVO : list) { +// userIncomeOutcomeVO.setPhonenumber(SM4EncryptUtils.sm4Decrypt(userIncomeOutcomeVO.getPhonenumber())); +// } +// } return list; } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java index 7dd39db..1e70015 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java @@ -19,11 +19,11 @@ public class TradeReportServiceImpl implements TradeReportService { public List selectTradeFlow(TradeFlowParam param) { String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); List tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue); - if(CollUtil.isNotEmpty(tradeFlowVOList)) { - for(TradeFlowVO vo : tradeFlowVOList) { - vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber())); - } - } +// if(CollUtil.isNotEmpty(tradeFlowVOList)) { +// for(TradeFlowVO vo : tradeFlowVOList) { +// vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber())); +// } +// } return tradeFlowVOList; }