Merge remote-tracking branch 'origin/master'

alien-entity/src/main/resources/mapper/ManagementInfoMapper.xml

@@ -274,7 +274,7 @@
         FROM
             life_user_order
         WHERE
-            ( `status` = 1
+            ( `status` in (1, 2)
             <if test="dataTime != null and dataTime != ''">
                 AND
                 buy_time > #{dataTime}
@@ -287,13 +287,13 @@
         FROM
             life_user_order
         WHERE
-            ( `status` = 1
+            ( `status` = 2
                 <if test="dataTime != null and dataTime != ''">
                     AND
                     used_time > #{dataTime}
                 </if>
             )
-           OR ( `status` = 0
+           OR ( `status` = 1
             <if test="dataTime != null and dataTime != ''">
                 AND
                 buy_time > #{dataTime}

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -103,11 +103,6 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             // 发送消息
             sendMsg(goods, trade, 1, "4");
 
-            // 创建交易时间小于十分钟,直接发送交易提醒
-            if (Math.abs(Duration.between(Instant.now(), trade.getTransactionTime().toInstant()).getSeconds()) < 600) {
-                sendSignInMessage(trade);
-            }
-
             return true;
         } catch (Exception e) {
             log.error("SecondTradeRecordServiceImpl.createTrade(): Error Msg={}", e.getMessage());
@@ -253,6 +248,11 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
             alienStoreFeign.sendMsgToClientByPhoneId(phoneId, JSONObject.from(webSocketVo).toJSONString());
             alienStoreFeign.sendMsgToClientByPhoneId(receiverId, JSONObject.from(webSocketVo).toJSONString());
 
+            // 创建交易时间小于十分钟,直接发送交易提醒
+            if (1 == type && Math.abs(Duration.between(Instant.now(), trade.getTransactionTime().toInstant()).getSeconds()) < 600) {
+                sendSignInMessage(trade);
+            }
+
             return true;
         } catch (BusinessException e) {
             throw new BusinessException(e);

alien-store/src/main/java/shop/alien/store/service/impl/PlatformStoreCouponServiceImpl.java

@@ -255,7 +255,7 @@ public class PlatformStoreCouponServiceImpl implements PlatformStoreCouponServic
             lifeGroupBuyMain.setStatus(status);
             lifeGroupBuyMain.setApprovalComments(comment);
             // 审核通过后开始
-            if (lifeGroupBuyMain.getStartTimeType() == 0 && lifeGroupBuyMain.getStatus() == 2) {
+            if (lifeGroupBuyMain.getStartTimeType() == 0 && lifeGroupBuyMain.getStatus() == 5) {
                 lifeGroupBuyMain.setStartTimeValue(new Date());
             }
             // 将待办列表状态设置为已审核