Merge branch 'hjc_bug_now_order' into hjc_bug_mix_now_order

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinStoreZhengzaiServiceImpl.java

@@ -71,7 +71,16 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         if (storeInfoVo == null) {
             return ResponseDto.failure("店铺不存在");
         }
+        GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
+        if (marketingVo.getStatus() == 7) {
+            return ResponseDto.failure("活动已停用");
+        }
+        //todo
         String storeId = storeInfoVo.getStoreId();
+        GoblinMarketingZhengzaiRelationVo marketingZhengzaiRelationVo = redisUtils.getZhengzaiRelation(marketId, storeId);
+        if (marketingZhengzaiRelationVo == null) {
+            return ResponseDto.failure("未参加活动");
+        }
         List<GoblinMarketRelationVo> relationVo = redisUtils.getMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketId);
         List<String> spuIdList = relationVo.stream().map(GoblinMarketRelationVo::getSpuId).collect(Collectors.toList());
         List<GoblinZhengzaiGoodVo> voList = ObjectUtil.getGoblinZhengzaiGoodVoArrayList();
@@ -124,7 +133,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
                 //redis
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
                 sqlDataOrder.add(new Object[]{
-                        storeOrderVo.getZhengzaiStatus(),storeOrderVo.getStatus(), now, storeOrderVo.getOrderId(), now, now
+                        storeOrderVo.getZhengzaiStatus(), storeOrderVo.getStatus(), now, storeOrderVo.getOrderId(), now, now
                 });
             }
             //mysql