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

@@ -85,7 +85,7 @@ public class CouponController {
             return HttpUtil.writeErrorInfo(response, e.getMessage());
         } catch (Exception e) {
             LOGGER.warn("exportForGet find wrong.", e);
-            return HttpUtil.writeErrorInfo(response, "<p>导出记录条数太多</p>");
+            return HttpUtil.writeErrorInfo(response, "<p>导出失败</p>");
         }
     }
 }

@@ -93,7 +93,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
                     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")
-                    ));
+                    ,userCoupon.getStatus()));
         }
         return userCouponQueryResps;
     }
@@ -240,7 +240,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
             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");
             CouponQueryResp resp = new CouponQueryResp(coupon.getId(),coupon.getCouponName(),coupon.getCouponAmount(),
-                    useTime,coupon.getRemark(), Coupon.CouponStatusEnum.getKey(coupon.getStatus()));
+                    useTime,coupon.getRemark(), Coupon.CouponStatusEnum.getKey(coupon.getStatus()),coupon.getStatus());
             resps.add(resp);
         }
         return resps;

@@ -34,14 +34,15 @@ public class CouponQueryResp {
             name = "状态"
     )
     private String status;
-
-    public CouponQueryResp(Integer id, String name, Float amount, String useTime, String remark, String status) {
+    private Integer statusValue;
+    public CouponQueryResp(Integer id, String name, Float amount, String useTime, String remark, String status, Integer statusValue) {
         this.id = id;
         this.name = name;
         this.amount = amount;
         this.useTime = useTime;
         this.remark = remark;
         this.status = status;
+        this.statusValue = statusValue;
     }
 
     public CouponQueryResp() {

@@ -26,17 +26,19 @@ public class UserCouponQueryResp {
             name = "使用状态"
     )
     private String status;
+    private Integer statusValue;
     @BatchExportField(
             name = "使用时间"
     )
     private String useTime;
 
-    public UserCouponQueryResp(String couponCode, Integer uid, String createTime, String status, String useTime) {
+    public UserCouponQueryResp(String couponCode, Integer uid, String createTime, String status, String useTime,Integer statusValue) {
         this.couponCode = couponCode;
         this.uid = uid;
         this.createTime = createTime;
         this.status = status;
         this.useTime = useTime;
+        this.statusValue = statusValue;
     }
 
     public UserCouponQueryResp() {