bonus
/
Bonus-Cloud-JYY-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-04-24 12:12:10 +08:00
parent 24aa5196ce e998808551
commit c2c1ee45f7
9 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccWalletOperationQueryParam.java
View File

@ -21,6 +21,7 @@ public class AccWalletOperationQueryParam extends BaseEntity {
private LocalDateTime endDateTime;
@ApiModelProperty("交易类型")
private Integer tradeType;
private Integer payState;
private String searchValue;
private String createBy;
private Long userId;

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

@ -28,9 +28,4 @@ public class AccountInfoQueryParam extends BaseEntity {
// private BigDecimal walletMinAmount;
// @ApiModelProperty("钱包最大金额")
// private BigDecimal walletMaxAmount;
public AccountInfoQueryParam() {
this.endDateTime = LocalDateTime.now().plusDays(7);
this.startDateTime = LocalDateTime.now().minusDays(7);
}
}

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

@ -470,9 +470,11 @@ public class AccInfoServiceImpl implements IAccInfoService {
@Override
public List<AccOperationListVO> queryAccPersonalWalOperationAddList(AccWalletOperationQueryParam param) {
List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param);
operationListVOList = operationListVOList.stream().peek(operation -> {
operation.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(operation.getPhoneNumber()));
}).collect(Collectors.toList());
if(CollUtil.isNotEmpty(operationListVOList)) {
for(AccOperationListVO vo: operationListVOList) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
}
}
return operationListVOList ;
}
}

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

@ -31,9 +31,9 @@ public class AccOperationHistoryServiceImpl extends ServiceImpl<AccOperationHist
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<AccOperationHistory> operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(operationRecordList)) {
operationRecordList = operationRecordList.stream().peek(accOperationRecord -> {
accOperationRecord.setPhone(SM4EncryptUtils.sm4Decrypt(accOperationRecord.getPhone()));
}).collect(Collectors.toList());
for(AccOperationHistory history : operationRecordList) {
history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone()));
}
}
return operationRecordList;
}

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

@ -368,9 +368,11 @@ public class AccSubServiceImpl implements AccSubService {
@Override
public List<AccOperationListVO> queryAccSubOperationList(AccWalletOperationQueryParam param) {
List<AccOperationListVO> operationListVOList = accTradeService.queryAccOperationList(param);
operationListVOList = operationListVOList.stream().peek(operation -> {
operation.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(operation.getPhoneNumber()));
}).collect(Collectors.toList());
if(CollUtil.isNotEmpty(operationListVOList)) {
for(AccOperationListVO vo: operationListVOList) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
}
}
return operationListVOList ;
}
}

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

@ -140,9 +140,9 @@ public class AccTradeServiceImpl implements IAccTradeService {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<AccOperationListVO> list = accTradeMapper.queryAccOperationList(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(list)) {
list = list.stream().peek(operation -> {
operation.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(operation.getPhoneNumber()));
}).collect(Collectors.toList());
for(AccOperationListVO vo : list) {
vo.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(vo.getPhoneNumber()));
}
}
return list;
}

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/report/controller/TradeReportController.java
View File

@ -34,7 +34,7 @@ public class TradeReportController extends BaseController
@ApiOperation("交易流水")
@PostMapping("/flow")
@ResponseBody
public TableDataInfo tradeFlowList(TradeFlowParam param)
public TableDataInfo tradeFlowList(@RequestBody TradeFlowParam param)
{
startPage();
List<TradeFlowVO> list = tradeReportService.selectTradeFlow(param);
@ -43,7 +43,7 @@ public class TradeReportController extends BaseController
@ApiOperation("营业汇总")
@PostMapping("/revenue/operating")
@ResponseBody
public TableDataInfo selectOperatingRevenue(OperatingRevenueParam param)
public TableDataInfo selectOperatingRevenue(@RequestBody OperatingRevenueParam param)
{
startPage();
List<OperatingRevenueVO> list = tradeReportService.selectOperatingRevenue(param);
@ -52,7 +52,7 @@ public class TradeReportController extends BaseController
@ApiOperation("食堂档口汇总")
@PostMapping("/revenue/canteen")
@ResponseBody
public TableDataInfo selectCanteenStallRevenue(CanteenStallRevenueParam param)
public TableDataInfo selectCanteenStallRevenue(@RequestBody CanteenStallRevenueParam param)
{
startPage();
List<CanteenStallRevenueVO> list = tradeReportService.selectCanteenStallRevenue(param);
@ -61,7 +61,7 @@ public class TradeReportController extends BaseController
@ApiOperation("设备汇总")
@PostMapping("/revenue/device")
@ResponseBody
public TableDataInfo selectDeviceRevenue(DeviceRevenueParam param)
public TableDataInfo selectDeviceRevenue(@RequestBody DeviceRevenueParam param)
{
startPage();
List<DeviceRevenueVO> list = tradeReportService.selectDeviceRevenue(param);
@ -70,7 +70,7 @@ public class TradeReportController extends BaseController
@ApiOperation("个人消费汇总")
@PostMapping("/revenue/user")
@ResponseBody
public TableDataInfo selectUserRevenue(UserRevenueParam param)
public TableDataInfo selectUserRevenue(@RequestBody UserRevenueParam param)
{
startPage();
List<UserRevenueVO> list = tradeReportService.selectUserRevenue(param);
@ -79,7 +79,7 @@ public class TradeReportController extends BaseController
@ApiOperation("菜品销售汇总")
@PostMapping("/revenue/goods")
@ResponseBody
public TableDataInfo selectGoodsRevenue(GoodsRevenueParam param)
public TableDataInfo selectGoodsRevenue(@RequestBody GoodsRevenueParam param)
{
startPage();
List<GoodsRevenueVO> list = tradeReportService.selectGoodsRevenue(param);

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

@ -1,5 +1,6 @@
package com.bonus.canteen.core.report.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.report.domain.*;
import com.bonus.canteen.core.report.mapper.TradeReportMapper;
import com.bonus.canteen.core.report.service.TradeReportService;
@ -8,6 +9,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class TradeReportServiceImpl implements TradeReportService {
@ -17,7 +19,13 @@ public class TradeReportServiceImpl implements TradeReportService {
@Override
public List<TradeFlowVO> selectTradeFlow(TradeFlowParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
return tradeReportMapper.selectTradeFlow(param, encryptedSearchValue);
List<TradeFlowVO> tradeFlowVOList = tradeReportMapper.selectTradeFlow(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(tradeFlowVOList)) {
for(TradeFlowVO vo : tradeFlowVOList) {
vo.setPhonenumber(SM4EncryptUtils.sm4Decrypt(vo.getPhonenumber()));
}
}
return tradeFlowVOList;
}
@Override

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

@ -242,7 +242,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN sys_dept sd ON sd.dept_id = ate.dept_id
LEFT JOIN acc_trade_wallet_detail atwd ON ate.trade_id = atwd.trade_id
<where>
ate.trade_type = #{param.tradeType} and ate.pay_state = 3
<if test="param.tradeType != null">
ate.trade_type = #{param.tradeType}
</if>
<if test="param.payState != null">
and ate.pay_state = #{param.payState}
</if>
<if test="param.startDateTime != null">
and ate.trade_time <![CDATA[ >= ]]> #{param.startDateTime}
</if>