提交bug

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -13,9 +13,9 @@ liquidnet:
     refresh-ttl: 525600
     blacklist_grace_period: 5
   mysql:
-    urlHostAndPort: 39.107.71.112:3308
-    username: testmall
-    password: zhengzai!mYT
+    urlHostAndPort: zhengzai.mysql.polardb.rds.aliyuncs.com:3306
+    username: java
+    password: pOOs9Y3wj#2^
   rabbitmq:
     host: rabbitmq.zhengzai.tv
     port: 5672
@@ -56,16 +56,16 @@ liquidnet:
       port: 6379
       password: 3Xa%8p
     candy:
-      dbs: 0,16
-      database: 15
-      host: 39.107.71.112
-      port: 6379
-      password: 3Xa%8p
+      dbs: 0,256
+      database: 255
+      host: r-2zet5fxvfxyj3z6fb0pd.redis.rds.aliyuncs.com
+      port: 6380
+      password: 5IR^Mhj!8z
   mongodb:
-    host: 39.107.71.112:27017
-    port: 27017
-    user: admin
-    pwd: S&y$6d*JwJ
+    host: s-2ze1b710761e2914-pub.mongodb.rds.aliyuncs.com:3717
+    port: 3717
+    user: java
+    pwd: QKRh9oJ0X15R
   service:
     adam:
       url-pay:

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

@@ -61,6 +61,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
 
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+            if(baseVo==null){
+                continue;
+            }
             if (type == 1) {
                 if (baseVo.getState().equals(3) || dtoItem.getState().equals(5)) {
                     continue;
@@ -121,6 +124,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                 continue;
             }
             CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+            if(baseVo==null){
+                continue;
+            }
             if (dtoItem.getExclusive().equals(1)) { //会员券
                 memberCoupon.add(baseVo);
             }
@@ -538,6 +544,9 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             if (uCouponIdList.contains(dtoItem.getUcouponId())) {
                 CandyCouponVo baseVo = CouponBaseUtil.getBaseCouponUserVo(dtoItem);
+                if(baseVo==null){
+                    continue;
+                }
                 vo.add(baseVo);
             } else {
                 continue;

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

 package com.liquidnet.service.candy.util;
 
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.candy.dto.CandyCouponInfoDto;
 import com.liquidnet.service.candy.dto.CandyCouponRuleDto;
 import com.liquidnet.service.candy.dto.CandyUserCouponBasicDto;
@@ -55,6 +56,9 @@ public class CouponBaseUtil {
         } else {
             vo.setCouType(dtoItem.getCouType());
         }
+        if (dtoItem.getDuedAt() == null) {
+            return null;
+        }
         vo.setState(getCouponState(now, dtoItem.getDuedAt(), dtoItem.getBindAt(), dtoItem.getState()));
         vo.setUseRules(rulesVoList);
         return vo;