Merge branch 'pre' into 'master'

Pre

See merge request !316

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

@@ -31,81 +31,81 @@ 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);
     }
 
     /**
      * redis保存用户
      */
     public void setSmileUserVO(String uid, SmileUserVO smileUserVO) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
+        getRedis().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
     }
 
     /**
      * redis获取SmileUserVO
      */
     public SmileUserVO getSmileUserVO(String uid) {
-        return (SmileUserVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_USER.concat(uid));
+        return (SmileUserVO) getRedis().get(SmileRedisConst.SMILE_USER.concat(uid));
     }
 
     /**
      * 根据学校id获取学校名称
      */
     public String getSchoolNameById(String schoolId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 根据学校id删除学校
      */
     public void delSchoolNameById(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 保存/更新学校
      */
     public void setSchool(String schoolId, String schoolName) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
     }
 
     /**
      * 保存全部学校
      */
     public void setSchoolAll(List<SmileSchoolVo> smileSchoolVos) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
     }
 
     /**
      * 删除缓存学校集合
      */
     public void delSchoolAll() {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL);
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 获取全部学校
      */
     public List<SmileSchoolVo> getSchoolAll() {
-       return (List<SmileSchoolVo>)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL);
+       return (List<SmileSchoolVo>)getRedis().get(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 删除学校
      */
     public void delSchool(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 获取演出打款状态
      */
     public String getShowStatus(String performancesId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
     }
 
 
@@ -115,7 +115,7 @@ public class SmileRedisUtils {
      */
     public void setUserDataByUid(UserData userData, String perId) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(userData.getUid());
-        redisDataSourceUtil.getRedisSweetUtil().set(key, userData, 60 * 60 * 24);
+        getRedis().set(key, userData, 60 * 60 * 24);
     }
 
     /**
@@ -124,7 +124,7 @@ public class SmileRedisUtils {
      */
     public UserData getUserDataByUid(String perId,String uid) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(uid);
-        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object obj = getRedis().get(key);
         if (obj==null){
             return null;
         }else {
@@ -136,7 +136,7 @@ public class SmileRedisUtils {
      * 保存演出ids
      */
     public void setShowIds(List<String> perId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
+        getRedis().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
     /**
@@ -177,75 +177,75 @@ public class SmileRedisUtils {
      * 保存个人打款
      */
     public void setPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
     }
 
     /**
      * 获取个人打款状态
      */
     public Integer getShowPriceUid(String performancesId, String uid) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 删除个人打款状态
      */
     public void delPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 总共演出打款
      */
     public void setShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
     }
 
     /**
      * 总共演出打款删除
      */
     public void delShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取演出打款状态
      */
     public Integer getShowPriceId(String performancesId) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取用户数据
      */
     public SmileSellDataVO getSellDataVO(String uid, String performancesId) {
-        return (SmileSellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
+        return (SmileSellDataVO) getRedis().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
     }
 
     /**
      * 保存票提
      */
     public void setAgent(String performancesId, String ticketId, SmileAgentVo smileAgentVo) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
+        getRedis().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
     }
 
     public SmileAgentVo getAgent(String performanceId, String ticketId) {
-        return (SmileAgentVo) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+        return (SmileAgentVo) getRedis().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
     }
 
     /**
      * 删除票提记录
      */
     public void delAgent(String performancesId, String ticketId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
+        getRedis().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
     }
 
     public BigDecimal getUserTotalPrice(String uid) {
-        return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
+        return (getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
     }
 
     public void setUserTotalPrice(String uid, BigDecimal add) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
+        getRedis().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
     }
 
     // 覆盖活动详情
@@ -325,7 +325,7 @@ public class SmileRedisUtils {
      */
     public void setShowVoByPerId(ShowVo vo) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(vo.getPerformancesId());
-        redisDataSourceUtil.getRedisSweetUtil().set(key,vo);
+        getRedis().set(key,vo);
     }
     /**
      * 获取演出列表vo
@@ -333,7 +333,7 @@ public class SmileRedisUtils {
      */
     public ShowVo getShowVoByPerId(String perId) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(perId);
-        Object o = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object o = getRedis().get(key);
         if (o==null){
             return null;
         }else {

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();