Merge branch 'refs/heads/test' into dev

# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java
#	src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -908,16 +908,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
                 return Result.error("验证码不能为空！");
             }
             Msg msg1 = null;
-            if (!"prod".equals(profiles) && !"147258".equals(msg)) {
+            if (!"prod".equals(profiles) && !"61626364".equals(msg)) {
                 msg1 = msgDao.findByPhoneAndCode(phone, msg);
                 if (msg1 == null) {
                     return Result.error("验证码不正确！");
                 }
             }
 
-            if (msg1 == null) {
-                return Result.error("验证码不正确！");
-            }
             userInfo = new UserEntity();
             UserEntity userEntity = null;
             if (StringUtils.isNotEmpty(inviterCode)) {

src/main/java/com/sqx/modules/job/task/TempOrdersTask.java

@@ -89,47 +89,42 @@ public class TempOrdersTask {
             return;
         }
         logger.info("订单表数据处理开始");
-        List<Orders> orders = ordersDao.selectList(Wrappers.<Orders>lambdaQuery()
-                .eq(Orders::getStatus, 0)
-                .lt(Orders::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15)));
-        if (CollUtil.isEmpty(orders)) {
+//        List<Orders> orders = ordersDao.selectList(Wrappers.<Orders>lambdaQuery()
+//                .eq(Orders::getStatus, 0)
+//                .lt(Orders::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15)));
+        List<PayDetails> payDetailsList = payDetailsDao.selectList(new LambdaQueryWrapper<PayDetails>()
+                .eq(PayDetails::getState, 0)
+                .lt(PayDetails::getCreateTime, DateUtil.offsetMinute(DateUtil.date(), -15)));
+        if (CollUtil.isEmpty(payDetailsList)) {
             return;
         }
 
-        logger.info("待处理数据{}条", orders.size());
+        logger.info("待处理数据{}条", payDetailsList.size());
 
-        for (Orders order : orders) {
-            ThreadUtil.sleep(100);
-
-            PayDetails payDetails = payDetailsDao.selectOneByLimit(order.getOrdersNo());
-            if (payDetails == null) {
-                order.setStatus(3);
-                ordersDao.updateById(order);
-                continue;
-            }
-            if (payDetails.getState() == 1) {
-                continue;
-            }
+        for (PayDetails details : payDetailsList) {
             try {
-                BaseResp baseResp = wuyouPay.queryOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0");
+                ThreadUtil.sleep(100);
+                Orders orders = ordersDao.selectOne(new LambdaQueryWrapper<Orders>()
+                        .eq(Orders::getOrdersNo, details.getOrderId()));
+
+                BaseResp baseResp = wuyouPay.queryOrder(details.getTradeNo(), details.getMoney().toString(), "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1 Edg/131.0.0.0");
                 logger.info("baseResp：{} ", JSONUtil.toJsonStr(baseResp));
                 if (baseResp.getCode() == null || baseResp.getCode() != 200) {
                     logger.info("code错误跳过");
                     continue;
                 }
                 if ("SUCCESS".equals(baseResp.getPayStatus()) || "SUCCESS".equals(baseResp.getPayStatus2())) {
-                    if (payDetails.getState() == 1) {
-                        continue;
-                    }
-                    logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails));
-                    logger.info("order：{} ", JSONUtil.toJsonStr(order));
-                    updateOrderStatus(payDetails, order);
+                    logger.info("payDetails：{} ", JSONUtil.toJsonStr(details));
+                    logger.info("order：{} ", JSONUtil.toJsonStr(orders));
+                    updateOrderStatus(details, orders);
                 } else {
-                    logger.info("订单未支付，修改状态: {}", payDetails.getTradeNo());
-                    order.setStatus(3);
-                    payDetails.setState(2);
-                    ordersDao.updateById(order);
-                    payDetailsDao.updateById(payDetails);
+                    logger.info("订单未支付，修改状态: {}", details.getTradeNo());
+                    if (orders != null) {
+                        orders.setStatus(3);
+                        ordersDao.updateById(orders);
+                    }
+                    details.setState(2);
+                    payDetailsDao.updateById(details);
                 }
             } catch (Exception e) {
                 e.printStackTrace();

src/main/java/com/sqx/modules/pay/wuyou/BaseResp.java

@@ -20,9 +20,11 @@ public class BaseResp {
     @JSONField(name = "payStatus")
     private String payStatus2;
 
+
     @JSONField(name = "error_msg")
     private String errorMsg;
 
     @JSONField(name = "error_code")
     private String errorCode;
+
 }

src/main/resources/mapper/app/MsgDao.xml

@@ -10,9 +10,7 @@
 
     <select id="findByPhoneAndCode" resultType="com.sqx.modules.app.entity.Msg">
       select * from msg where phone=#{phone}
-        <if test="msg!='147258'">
             and code = #{msg}
-        </if>
     </select>
 
 </mapper>