Merge branch 'dev-resources-20181116' into test6.8.2

@@ -84,10 +84,10 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
     }
 
     private List<UserCouponQueryResp> initUserCouponQueryResps(List<UserCoupon> userCoupons) {
+        List<UserCouponQueryResp> userCouponQueryResps = new ArrayList<>();
         if(CollectionUtils.isEmpty(userCoupons)){
-            return null;
+            return userCouponQueryResps;
         }
-        List<UserCouponQueryResp> userCouponQueryResps = new ArrayList<>();
         for(UserCoupon userCoupon : userCoupons){
             userCouponQueryResps.add(new UserCouponQueryResp(userCoupon.getCouponCode(),userCoupon.getUid(),
                     com.yoho.ufo.util.DateUtil.int2DateStr(userCoupon.getCreateTime(),"yyyy-MM-dd HH:mm:ss"),
@@ -232,10 +232,10 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
     }
 
     private List<CouponQueryResp> initCouponQueryResps(List<Coupon> coupons) {
+        List<CouponQueryResp> resps = new ArrayList<>();
         if(CollectionUtils.isEmpty(coupons)){
-            return null;
+            return resps;
         }
-        List<CouponQueryResp> resps = new ArrayList<>();
         for(Coupon coupon : coupons){
             String useTime = com.yoho.ufo.util.DateUtil.int2DateStr(coupon.getStartTime(),"yyyy-MM-dd HH:mm:ss")+"至"+
                     com.yoho.ufo.util.DateUtil.int2DateStr(coupon.getEndTime(),"yyyy-MM-dd HH:mm:ss");