Merge branch 'master' into gaohu-smile-0915-three

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -31,11 +31,11 @@ public class SmileRedisUtils {
 
 
     public AbstractRedisUtil getRedis() {
-        return redisDataSourceUtil.getRedisSweetUtil();
+        return redisDataSourceUtil.getRedisKylinUtil();
     }
 
     public Object get(String key){
-        return redisDataSourceUtil.getRedisSweetUtil().get(key);
+        return redisDataSourceUtil.getRedisKylinUtil().get(key);
     }
 
     /**

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.xml

@@ -54,7 +54,7 @@
         <include refid="Rst_CommonCouponBasicDto_Column_List"/>
         FROM candy_common_coupon ccc
         LEFT JOIN candy_coupon cc ON ccc.coupon_id = cc.coupon_id
-        WHERE ccc.state <![CDATA[<>]]> 2
+        WHERE ccc.state in (1,3)
         AND ccc.created_at <![CDATA[>=]]> #{ucreatedAt,jdbcType=TIMESTAMP}
     </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyUserCouponMapper.xml

@@ -56,7 +56,7 @@
         <include refid="Rst_UserCouponBasicDto_Column_List"/>
         FROM candy_user_coupon cuc
         LEFT JOIN candy_coupon cc ON cuc.coupon_id = cc.coupon_id
-        WHERE cuc.state <![CDATA[<>]]> 2
+        WHERE cuc.state in (1,3,5)
         AND cuc.uid = #{uid,jdbcType=VARCHAR}
     </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCommonCouponService.java

@@ -45,7 +45,7 @@ public class PlatformCandyCommonCouponService extends ServiceImpl<CandyCommonCou
             int totalCount = this.count(commonCouponQueryWrapper);
             int remainCount = totalCount, pSize = 1000;
             if (totalCount > 0) {
-                log.info("券移除处理:公有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusDays(displayDays));
+                log.info("券移除处理:公有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusSeconds(displayDays));
             }
 
             ArrayList<CandyCommonCoupon> updateCommonCouponList = ObjectUtil.getCandyCommonCouponArrayList();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -141,7 +141,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
             int totalCount = this.count(userCouponQueryWrapper);
             int remainCount = totalCount, pSize = 1000;
             if (totalCount > 0) {
-                log.info("券移除处理:私有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusDays(displayDays));
+                log.info("券移除处理:私有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusSeconds(displayDays));
             }
 
             ArrayList<CandyUserCoupon> updateUserCouponList = ObjectUtil.getCandyUserCouponArrayList();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java

@@ -79,7 +79,7 @@ public class SellDataInfoImpl {
                         String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
                         String yanChuName=a.get("title")==null?"":a.get("title").toString();
                             //判断是否 已经跑过一遍了
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
                             continue;
                         }
                         //获取 该人 该演出 的所有订单
@@ -121,7 +121,7 @@ public class SellDataInfoImpl {
                             smileSellDataVO.setSellDataOneVO(listSellDataOneVo);
                             smileSellDataVO.setUpdateTime(LocalDateTime.now());
                             //redis 里面放入
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
                             Query query = Query.query(Criteria.where("sellDataId").is(smileSellDataVO.getSellDataId()));
                             Document document = (Document)mongoConverter.convertToMongoType(smileSellDataVO);
                             Update update = Update.fromDocument(document);
@@ -133,8 +133,8 @@ public class SellDataInfoImpl {
                             //mongodb 里面放入
                             mongoTemplate.insert(smileSellDataVO, SmileSellDataVO.class.getSimpleName());*/
                         }
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
                         }
                     }
 
@@ -178,7 +178,7 @@ public class SellDataInfoImpl {
                for(Map a: userPerformanceList){
                     //取出id 查看是否结算
                    String performanceId= a.get("performanceId")==null?"":a.get("performanceId").toString();
-                   if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                   if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
                        //已结算（已完成）
                        a.put("status","3");
                    }else{
@@ -202,7 +202,7 @@ public class SellDataInfoImpl {
                //待入账
                commissionVO.setDaiRuZhang(daiRuZhang);
                commissionVO.setKeJieSuan(keJieSuan);
-               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
+               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisKylinUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
                redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA_COMMISSION.concat(smileUser.getUid()),commissionVO);
            }
        }