czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai 2025-03-19 10:39:37 +08:00
parent e6b08aae37 15cc93c0ee
commit aed4034757
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml
View File

@ -8,8 +8,8 @@
SELECT
record.id,
vip.id as userId ,
vip.`name`,
vip.telephone as phone,
vip.`nick_name`,
vip.phone as phone,
record.create_time as receiveTime,
record.update_time as useTime,
record.source as source

4
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
View File

@ -54,8 +54,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
// 获取前一天的结束时间（23:59:59）
DateTime endOfDay = DateUtil.endOfDay(yesterday);
List<OrderInfo> orderInfos = orderInfoService.list(new QueryWrapper()
.ge(OrderInfo::getCreateTime, startOfDay)
.le(OrderInfo::getCreateTime, endOfDay)
.ge(OrderInfo::getPaidTime, startOfDay)
.le(OrderInfo::getPaidTime, endOfDay)
.ne(OrderInfo::getStatus, "unpaid").ne(OrderInfo::getStatus, "cancelled"));
// 统计充值记录