Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of…

Merge branches 'feature/20210728_购物车满赠优惠空判断_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

order-application-service/src/main/java/cn/freemud/service/CallerService.java

@@ -9,6 +9,7 @@ import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
 import cn.freemud.entities.dto.ecology.SubscribeMessageResponse;
 import cn.freemud.entities.vo.TakeMealNoticesVO;
 import cn.freemud.enums.MessageEventTypeEnum;
+import cn.freemud.redis.RedisCache;
 import cn.freemud.service.impl.CheckOrder;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.utils.DateTimeUtil;
@@ -39,12 +40,14 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class CallerService {
 
-    private final RedisTemplate redisTemplate;
+//    private final RedisTemplate redisTemplate;
     private final EcologyAdminApplicationClient ecologyAdminApplicationClient;
     private final OrderCenterSdkService orderCenterSdkService;
     private final CheckOrder checkOrder;
     @Autowired
     private LogUtil logUtil;
+    @Autowired
+    private RedisCache redisCache;
 
 
     /**
@@ -53,6 +56,7 @@ public class CallerService {
      * @param vo
      */
     private void cacheTakeMealNotices(TakeMealNoticesVO vo) {
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
         String redisKey = RedisKeyConstant.notMadeGoodsNumber(vo.getPartnerId(), vo.getStoreCode());
         redisTemplate.boundValueOps(redisKey).set(vo.getCupTotalNum(), 1, TimeUnit.DAYS);
     }