From fb5bf1985562bf5d335ff25358e2f1ee0e3b54aa Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Mon, 4 Aug 2025 16:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java | 2 +- src/main/resources/mapper/OrderMainMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index df87336..a3b34b2 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -112,7 +112,7 @@ public class OrderServiceImpl implements OrderService { paymentType = PaymentTypeEnum.ZFB_DQ.getCode(); } } else { - if(StringUtils.equalsIgnoreCase(userInfoDTO.getMiniProgramType(), MiniProgramTypeEnum.ALIPAY.getType())){ + if(StringUtils.equalsIgnoreCase(userInfoDTO.getMiniProgramType(), MiniProgramTypeEnum.WECHAT.getType())){ paymentType = PaymentTypeEnum.WX_PAY.getCode(); }else { paymentType = PaymentTypeEnum.ZFB_PAY.getCode(); diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml index 6f1b3ad..bd87640 100644 --- a/src/main/resources/mapper/OrderMainMapper.xml +++ b/src/main/resources/mapper/OrderMainMapper.xml @@ -8,7 +8,7 @@ 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 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 = 'RENT_OVERDUE' THEN 1 END) as overdue_count FROM zc_order_main