Merge remote-tracking branch 'origin/qa' into qa

order-application-service/src/main/java/cn/freemud/entities/dto/GetMemberExtendInfoResponseDto.java

@@ -32,8 +32,8 @@ public class GetMemberExtendInfoResponseDto {
         private String id;
         private String paidId;
         private String paidName;
-        private Date openTime;
-        private Date expiryTime;
+//        private Long openTime;
+//        private Long expiryTime;
     }
 
     @Data
@@ -41,6 +41,6 @@ public class GetMemberExtendInfoResponseDto {
         private String memberId;
         private String labelCode;
         private String labelName;
-        private Date updateTime;
+//        private Long updateTime;
     }
 }

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -119,8 +119,10 @@ public class SellCouponOrderServiceImpl {
     private OrderAdapter orderAdapter;
     @Autowired
     private OrderSdkAdapter orderSdkAdapter;
+//    @Autowired
+//    private RedisCache redisCache;
     @Autowired
-    private RedisCache redisCache;
+    protected RedisTemplate redisTemplate;
     @Autowired
     private CouponService couponService;
     @Autowired
@@ -419,7 +421,7 @@ public class SellCouponOrderServiceImpl {
         String key = this.getFolwNo(requestVo.getAppId(), date);
 
         int flowno = 0;
-        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
+//        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
 
         if (redisTemplate.opsForValue().setIfAbsent(key, 0)) {
             redisTemplate.expire(key, 24, TimeUnit.HOURS);