下架活动不能下单

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -86,7 +86,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             LocalDateTime st = LocalDateTime.parse(mixVo.getTimeStart(), DTF_YMD_HMS);
             LocalDateTime et = LocalDateTime.parse(mixVo.getTimeEnd(), DTF_YMD_HMS);
             LocalDateTime nt = LocalDateTime.now();
-            if (!nt.isAfter(st) && nt.isBefore(et)) {
+            if (!(nt.isAfter(st) && nt.isBefore(et)) || mixVo.getStatus() == 7) {
                 return ResponseDto.failure("不在活动有效期内");
             }
             //判断白名单
@@ -186,7 +186,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             if (skuInfoList.size() > 0) {
                 preParam = goblinOrder(skuInfoList, skuMix, param.getAddressesVo(), mobile, source, version, nickName, nt, uid, param.getPayType(), param.getDeviceFrom());
             }
-            return ResponseDto.success(payOrder(nftOrderList, preParam, orderMasterCode, param.getShowUrl(), param.getReturnUrl(), param.getDeviceFrom(), param.getPayType(), mixId, mixVo.getName(), param.getOpenId(), nt,storeName));
+            return ResponseDto.success(payOrder(nftOrderList, preParam, orderMasterCode, param.getShowUrl(), param.getReturnUrl(), param.getDeviceFrom(), param.getPayType(), mixId, mixVo.getName(), param.getOpenId(), nt, storeName));
         } catch (Exception e) {
             e.printStackTrace();
             initStock(canBuyIds, mixId, isUseLimit, uid);
@@ -550,7 +550,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
         boolean isSuccess = true;
 
         for (String orderId : nft) {
-            if("".equals(orderId)){
+            if ("".equals(orderId)) {
                 break;
             }
             String nftR = syncNft(orderId, code, status, paymentType, paymentId, paymentAt);
@@ -559,7 +559,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             }
         }
         for (String orderId : goblin) {
-            if("".equals(orderId)){
+            if ("".equals(orderId)) {
                 break;
             }
             String goblinR = syncGoblin(orderId, code, status, paymentType, paymentId, paymentAt);
@@ -766,7 +766,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
         String[] goblin = map.get("goblin");
 
         for (String orderId : nft) {
-            if("".equals(orderId)){
+            if ("".equals(orderId)) {
                 break;
             }
             String nftR = nftCheck(uid, orderId);
@@ -777,7 +777,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
             }
         }
         for (String orderId : goblin) {
-            if("".equals(orderId)){
+            if ("".equals(orderId)) {
                 break;
             }
             String goblinR = goblinCheck(uid, orderId);