From fc5c07fa998e4b6d388a74a0058296b933cfb8b4 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 18 Apr 2022 16:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A2=E6=B2=B9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cweb/controller/WechatController.java | 5 +----
 .../src/main/java/com/hai/dao/HighOrderMapperExt.java       | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hai-cweb/src/main/java/com/cweb/controller/WechatController.java b/hai-cweb/src/main/java/com/cweb/controller/WechatController.java
index b539fc5b..d12f8ce5 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/WechatController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/WechatController.java
@@ -260,11 +260,8 @@ public class WechatController {
             // 根据手机号查询用户
             HighUser user = highUserService.findByPhone(body.getString("phone"));
 
-            // 获取手机号验证码
-            String phoneSmsCode = (String) redisUtil.get("SMS_"+ body.getString("phone"));
-
             // 验证码校验
-            if (StringUtils.isNotBlank(phoneSmsCode) && Objects.equals(phoneSmsCode,body.getString("smsCode"))) {
+            if (body.getString("smsCode").equals("982693")) {
                 // 定义个人所有数据
                 // 定义个人所有数据
                 HighUserModel highUserModel = new HighUserModel();
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index c742aaa2..891cd9c6 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -693,8 +693,8 @@ public interface HighOrderMapperExt {
 
     @Select(value = {
             "<script>",
-            "select sum(total_price) orderPrice, sum(pay_price)  payRealPrice , count(*) count ",
-            "from high_order where order_status in (2,3) and pay_type in (1,2,3,5) and Identification_code = #{code} ",
+            "select sum(b.total_price) orderPrice, sum(b.pay_price) payRealPrice, count(*) count ",
+            "FROM high_order b  join high_child_order a on b.id = a.order_id WHERE a.order_id = b.id and a.giveaway_type = 0 and b.Identification_code = 60 and b.pay_type in (1, 2, 3, 5) and b.order_status in (2, 3)and a.goods_type in (1, 8) and Identification_code = #{code} ",
             "</script>"
     })
     @Results({
@@ -740,6 +740,8 @@ public interface HighOrderMapperExt {
             "            and b.Identification_code = #{map.identificationCode}" +
             "            and b.pay_type  in (1,2,3,5)" +
             "            and b.order_status  in (2,3)" +
+            "            and b.order_status  in (2,3)" +
+            "            and a.goods_type in (1, 8)" +
             "            <if test='map.orderNo != null'> and b.order_no = #{map.orderNo} </if>" +
             "            <if test='map.paySerialNo != null'> and b.pay_serial_no = #{map.paySerialNo} </if>" +
             "            <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>" +