券导出

@@ -18,6 +18,12 @@ public class CouponQueryResp {
             name = "券名称"
     )
     private String name;
+
+    @BatchExportField(
+            name = "用户类型"
+    )
+    private String userTypeName;
+
     @BatchExportField(
             name = "TOKEN"
     )
@@ -38,8 +44,6 @@ public class CouponQueryResp {
             name = "状态"
     )
 
-    private Integer userType;
-
     private String status;
     private Integer statusValue;
 

@@ -10,6 +10,9 @@ import com.yoho.error.exception.ServiceException;
 import com.yoho.ufo.coupon.model.CouponAndProductConditions;
 import com.yoho.ufo.coupon.model.ProductCondition;
 import com.yoho.ufo.coupon.model.ProductLimitType;
+import com.yoho.ufo.coupon.model.resp.CouponQueryResp;
+import com.yoho.ufo.coupon.model.resp.UidCouponQueryResp;
+import com.yoho.ufo.coupon.model.resp.UserCouponQueryResp;
 import com.yoho.ufo.coupon.service.ICouponService;
 import com.yoho.ufo.coupon.service.ProductServiceCaller;
 import com.yoho.ufo.coupon.service.builder.CouponAndProductConditionsBuilder;
@@ -25,13 +28,11 @@ import com.yoho.ufo.model.coupon.Coupon;
 import com.yoho.ufo.model.coupon.CouponProductLimit;
 import com.yoho.ufo.model.coupon.UserCoupon;
 import com.yoho.ufo.model.coupon.UserCouponNum;
-import com.yoho.ufo.coupon.model.resp.CouponQueryResp;
-import com.yoho.ufo.coupon.model.resp.UidCouponQueryResp;
-import com.yoho.ufo.coupon.model.resp.UserCouponQueryResp;
 import com.yoho.ufo.service.IBusinessExportService;
 import com.yoho.ufo.service.impl.BatchService;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.model.ApiResponse;
+import com.yoho.ufo.util.DateUtil;
 import com.yohobuy.ufo.coupon.req.*;
 import com.yohobuy.ufo.model.common.PageResponseBO;
 import com.yohobuy.ufo.model.promotion.CouponDisplayBo;
@@ -53,8 +54,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.yoho.ufo.util.DateUtil;
-
 /**
  * Created by shengguo.cai on 2018/11/20.
  */
@@ -750,7 +749,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
             CouponQueryResp resp = new CouponQueryResp(coupon.getId(),coupon.getCouponName(),coupon.getCouponNum(),
                     useTime,coupon.getRemark(), getStatusDesc(coupon,curTime),coupon.getStatus(),coupon.getCouponToken());
             resp.setSendNum(coupon.getSendNum());
-            resp.setUserType(coupon.getUserType());
+            resp.setUserTypeName(UserTypeEnum.find(coupon.getUserType()).getName());
             resp.setBusinessClient(coupon.getBusinessClient());
             resps.add(resp);
         }