Merge branch 'dev' of http://139.159.177.244:3000/hurui/hai-server into dev

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();

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>" +