Merge branch 'test6.8.2' of http://git.yoho.cn/ufo/ufo-platform into test6.8.2

caoyan
Commit 07709e1e511dd5b15500095d293d96ea39eb89db 2 parents a283462e 4f2a0423
Showing 1 changed file with 1 additions and 1 deletions
coupon/src/main/java/com/yoho/ufo/coupon/service/impl/CouponServiceImpl.java
--- a/coupon/src/main/java/com/yoho/ufo/coupon/service/impl/CouponServiceImpl.java
View file @07709e1
+++ b/coupon/src/main/java/com/yoho/ufo/coupon/service/impl/CouponServiceImpl.java
View file @07709e1
@@ -94,7 +94,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
             userCouponQueryResps.add(new UserCouponQueryResp(userCoupon.getCouponCode(),userCoupon.getUid(),
                     com.yoho.ufo.util.DateUtil.int2DateStr(userCoupon.getCreateTime(),"yyyy-MM-dd HH:mm:ss"),
                     UserCoupon.UserCouponStatusEnum.getKey(userCoupon.getStatus()),
-                     null == userCoupon.getUseTime()?null:com.yoho.ufo.util.DateUtil.int2DateStr(userCoupon.getUseTime(),"yyyy-MM-dd HH:mm:ss")
+                     null == userCoupon.getUseTime() || 0 == userCoupon.getUseTime()?null:com.yoho.ufo.util.DateUtil.int2DateStr(userCoupon.getUseTime(),"yyyy-MM-dd HH:mm:ss")
                     ,userCoupon.getStatus()));
         }
         return userCouponQueryResps;