sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://115.190.8.52:3000/sczx_group/sczx_order

Browse Source
This commit is contained in:
zhangli
2025-08-04 23:58:45 +08:00
parent 81606bed08 fb5bf19855
commit 30ffa59af0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -112,7 +112,7 @@ public class OrderServiceImpl implements OrderService {
paymentType = PaymentTypeEnum.ZFB_DQ.getCode(); paymentType = PaymentTypeEnum.ZFB_DQ.getCode();
} }
} else { } else {
if(StringUtils.equalsIgnoreCase(userInfoDTO.getMiniProgramType(), MiniProgramTypeEnum.ALIPAY.getType())){ if(StringUtils.equalsIgnoreCase(userInfoDTO.getMiniProgramType(), MiniProgramTypeEnum.WECHAT.getType())){
paymentType = PaymentTypeEnum.WX_PAY.getCode(); paymentType = PaymentTypeEnum.WX_PAY.getCode();
}else { }else {
paymentType = PaymentTypeEnum.ZFB_PAY.getCode(); paymentType = PaymentTypeEnum.ZFB_PAY.getCode();

2
src/main/resources/mapper/OrderMainMapper.xml
View File

@ -8,7 +8,7 @@
COUNT(*) as total_orders, COUNT(*) as total_orders,
SUM(CASE WHEN (order_status = 'AUTO_END' OR order_status = 'MANUAL_END') AND DATE_FORMAT(end_order_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') THEN 1 ELSE 0 END) as monthly_completed_orders, SUM(CASE WHEN (order_status = 'AUTO_END' OR order_status = 'MANUAL_END') AND DATE_FORMAT(end_order_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') THEN 1 ELSE 0 END) as monthly_completed_orders,
SUM(CASE WHEN (order_status = 'AUTO_END' OR order_status = 'MANUAL_END') AND DATE_FORMAT(end_order_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') THEN order_amount ELSE 0 END) as monthly_order_amount, SUM(CASE WHEN (order_status = 'AUTO_END' OR order_status = 'MANUAL_END') AND DATE_FORMAT(end_order_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m') THEN order_amount ELSE 0 END) as monthly_order_amount,
COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_pickup_count, COUNT(CASE WHEN order_status = 'WAIT_PICK' THEN 1 END) as pending_pickup_count,
COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count, COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count,
COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count
FROM zc_order_main FROM zc_order_main