bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-07-03 11:23:27 +08:00
parent ca6db30a52 ca1d10ff92
commit 5c975cd755
10 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccConsumeDetailVO.java
View File

@ -64,4 +64,9 @@ public class AccConsumeDetailVO implements Serializable {
* 来源类型 * 来源类型
*/ */
private Integer sourceType; private Integer sourceType;
/**
* 订单编号
*/
private String stallName;
} }

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
View File

@ -255,10 +255,10 @@ public class AccInfoServiceImpl implements IAccInfoService {
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return; return;
} }
list = list.stream().peek(item -> { // list = list.stream().peek(item -> {
String decryptedPhoneNumber = SM4EncryptUtils.sm4Decrypt(item.getPhoneNumber()); // String decryptedPhoneNumber = SM4EncryptUtils.sm4Decrypt(item.getPhoneNumber());
item.setPhoneNumber(decryptedPhoneNumber); // item.setPhoneNumber(decryptedPhoneNumber);
}).collect(Collectors.toList()); // }).collect(Collectors.toList());
List<Long> custIdList = list.stream() List<Long> custIdList = list.stream()
.map(AccInfoDetailsVO::getUserId) .map(AccInfoDetailsVO::getUserId)
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -468,11 +468,11 @@ public class AccInfoServiceImpl implements IAccInfoService {
@Override @Override
public List<AccOperationListVO> queryAccPersonalWalOperationAddList(AccWalletOperationQueryParam param) { public List<AccOperationListVO> queryAccPersonalWalOperationAddList(AccWalletOperationQueryParam param) {
List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param); List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param);
if(CollUtil.isNotEmpty(operationListVOList)) { // if(CollUtil.isNotEmpty(operationListVOList)) {
for(AccOperationListVO vo: operationListVOList) { // for(AccOperationListVO vo: operationListVOList) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); // vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
} // }
} // }
return operationListVOList ; return operationListVOList ;
} }
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccOperationHistoryServiceImpl.java
View File

@ -29,11 +29,11 @@ public class AccOperationHistoryServiceImpl extends ServiceImpl<AccOperationHist
public List<AccountInfoHistoryVO> selectAccOperationHistory(AccOperationQueryParam param) { public List<AccountInfoHistoryVO> selectAccOperationHistory(AccOperationQueryParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<AccountInfoHistoryVO> operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue); List<AccountInfoHistoryVO> operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(operationRecordList)) { // if(CollUtil.isNotEmpty(operationRecordList)) {
for(AccountInfoHistoryVO history : operationRecordList) { // for(AccountInfoHistoryVO history : operationRecordList) {
history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone())); // history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone()));
} // }
} // }
return operationRecordList; return operationRecordList;
} }

13
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java
View File

@ -361,7 +361,8 @@ public class AccSubServiceImpl implements AccSubService {
errVO.setNickName(accInfo.getNickName()); errVO.setNickName(accInfo.getNickName());
errVO.setDeptFullName(accInfo.getDeptFullName()); errVO.setDeptFullName(accInfo.getDeptFullName());
errVO.setUserType(accInfo.getUserType()); errVO.setUserType(accInfo.getUserType());
errVO.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(accInfo.getPhoneNumber())); // errVO.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(accInfo.getPhoneNumber()));
errVO.setPhoneNumber(accInfo.getPhoneNumber());
errVO.setAmount(amount); errVO.setAmount(amount);
errVO.setErrorMessage(errMsg); errVO.setErrorMessage(errMsg);
return errVO; return errVO;
@ -369,11 +370,11 @@ public class AccSubServiceImpl implements AccSubService {
@Override @Override
public List<AccOperationListVO> queryAccSubOperationList(AccWalletOperationQueryParam param) { public List<AccOperationListVO> queryAccSubOperationList(AccWalletOperationQueryParam param) {
List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param); List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param);
if(CollUtil.isNotEmpty(operationListVOList)) { // if(CollUtil.isNotEmpty(operationListVOList)) {
for(AccOperationListVO vo: operationListVOList) { // for(AccOperationListVO vo: operationListVOList) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); // vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
} // }
} // }
return operationListVOList ; return operationListVOList ;
} }
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java
View File

@ -153,11 +153,11 @@ public class AccTradeServiceImpl implements IAccTradeService {
public List<AccOperationListVO> queryAccOperationList(AccWalletOperationQueryParam param) { public List<AccOperationListVO> queryAccOperationList(AccWalletOperationQueryParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<AccOperationListVO> list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue); List<AccOperationListVO> list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(list)) { // if(CollUtil.isNotEmpty(list)) {
for(AccOperationListVO vo : list) { // for(AccOperationListVO vo : list) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber())); // vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
} // }
} // }
return list; return list;
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenStaffMorningCheckServiceImpl.java
View File

@ -46,11 +46,11 @@ public class KitchenStaffMorningCheckServiceImpl implements IKitchenStaffMorning
kitchenStaffMorningCheck.setEncryptedSearchValue(encryptedSearchValue); kitchenStaffMorningCheck.setEncryptedSearchValue(encryptedSearchValue);
List<KitchenStaffMorningCheck> kitchenStaffMorningCheckList = kitchenStaffMorningCheckMapper List<KitchenStaffMorningCheck> kitchenStaffMorningCheckList = kitchenStaffMorningCheckMapper
.selectKitchenStaffMorningCheckList(kitchenStaffMorningCheck); .selectKitchenStaffMorningCheckList(kitchenStaffMorningCheck);
if(CollUtil.isNotEmpty(kitchenStaffMorningCheckList)) { // if(CollUtil.isNotEmpty(kitchenStaffMorningCheckList)) {
kitchenStaffMorningCheckList.forEach(value -> { // kitchenStaffMorningCheckList.forEach(value -> {
value.setMobile(SM4EncryptUtils.sm4Decrypt(value.getMobile())); // value.setMobile(SM4EncryptUtils.sm4Decrypt(value.getMobile()));
}); // });
} // }
return kitchenStaffMorningCheckList; return kitchenStaffMorningCheckList;
} }

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/service/impl/OrderInfoServiceImpl.java
View File

@ -130,7 +130,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService
orderDetail.setOrderId(order.getOrderId()); orderDetail.setOrderId(order.getOrderId());
List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail); List<OrderDetail> orderDetailList = orderDetailService.selectOrderDetailList(orderDetail);
order.setOrderDetailList(orderDetailList); 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())); order.setDeliveryTypeName(DeliveryTypeEnum.getDescByKey(order.getDeliveryType()));
}); });
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/AccReportServiceImpl.java
View File

@ -49,11 +49,11 @@ public class AccReportServiceImpl implements AccReportService {
public List<UserIncomeOutcomeVO> selectUserIncomeOutcome(UserIncomeOutcomeParam param) { public List<UserIncomeOutcomeVO> selectUserIncomeOutcome(UserIncomeOutcomeParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<UserIncomeOutcomeVO> list = accReportMapper.selectUserIncomeOutcome(param, encryptedSearchValue); List<UserIncomeOutcomeVO> list = accReportMapper.selectUserIncomeOutcome(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(list)) { // if(CollUtil.isNotEmpty(list)) {
for (UserIncomeOutcomeVO userIncomeOutcomeVO : list) { // for (UserIncomeOutcomeVO userIncomeOutcomeVO : list) {
userIncomeOutcomeVO.setPhonenumber(SM4EncryptUtils.sm4Decrypt(userIncomeOutcomeVO.getPhonenumber())); // userIncomeOutcomeVO.setPhonenumber(SM4EncryptUtils.sm4Decrypt(userIncomeOutcomeVO.getPhonenumber()));
} // }
} // }
return list; return list;
} }
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/service/impl/TradeReportServiceImpl.java
View File

@ -19,11 +19,11 @@ public class TradeReportServiceImpl implements TradeReportService {
public List<TradeFlowVO> selectTradeFlow(TradeFlowParam param) { public List<TradeFlowVO> selectTradeFlow(TradeFlowParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<TradeFlowVO> tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue); List<TradeFlowVO> tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(tradeFlowVOList)) { // if(CollUtil.isNotEmpty(tradeFlowVOList)) {
for(TradeFlowVO vo : tradeFlowVOList) { // for(TradeFlowVO vo : tradeFlowVOList) {
vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber())); // vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber()));
} // }
} // }
return tradeFlowVOList; return tradeFlowVOList;
} }

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -312,9 +312,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
atwd.wallet_type, atwd.wallet_type,
atwd.amount, atwd.amount,
atwd.wallet_bal, atwd.wallet_bal,
oi.source_type oi.source_type,
bs.stall_name
from from
order_info oi order_info oi
left join basic_stall bs on
oi.stall_id = bs.stall_id
inner join account_trade at2 on inner join account_trade at2 on
oi.order_id = at2.order_no oi.order_id = at2.order_no
inner join account_trade_wallet_detail atwd on 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 oi.user_id = su.user_id
inner join sys_dept sd on inner join sys_dept sd on
su.dept_id = sd.dept_id su.dept_id = sd.dept_id
where where
atwd.trade_type in (110, 120, 130) atwd.trade_type in (110, 120, 130)
and oi.order_state in (1, 2, 3) and oi.order_state in (1, 2, 3)