bug fixes

src/main/java/com/caimei/modules/coupon/entity/CmCoupon.java

@@ -21,9 +21,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     private String name;        // 活动主题
     private BigDecimal couponAmount;        // 优惠券金额(面值)
     private BigDecimal touchPrice;        // 优惠满减条件金额
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;        // 使用开始时间（有效期）
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;        // 使用结束时间（有效期）
     private String status;        // 状态 0未生效 1已生效 2已关闭 3已失效
     private Integer couponType;        // 劵类型 0活动券 1品类券 2用户专享券 3店铺券 4新用户券
@@ -43,7 +41,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
     private Integer codeNum;       //兑换码数量
     private Integer clubCouponId;      //机构领券id
     private String couponName;          //优惠券名称
-    private String desc;        //描述
+    private String couponDesc;        //描述
     private CmCouponClub couponClub;
     private NewCmShop shop;
     private List<Integer> productIdList;
@@ -81,7 +79,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         this.touchPrice = touchPrice;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartDate() {
         return startDate;
     }
@@ -90,7 +88,7 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         this.startDate = startDate;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getEndDate() {
         return endDate;
     }
@@ -271,11 +269,11 @@ public class CmCoupon extends DataEntity<CmCoupon> {
         this.couponName = couponName;
     }
 
-    public String getDesc() {
-        return desc;
+    public String getCouponDesc() {
+        return couponDesc;
     }
 
-    public void setDesc(String desc) {
-        this.desc = desc;
+    public void setCouponDesc(String couponDesc) {
+        this.couponDesc = couponDesc;
     }
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2196,20 +2196,20 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 if ("2".equals(coupon.getProductType())) {
                     List<Integer> productIdList = cmCouponDao.findAllProductId(coupon.getId());
                     coupon.setProductIdList(productIdList);
-                    coupon.setDesc("仅可购买指定商品");
+                    coupon.setCouponDesc("仅可购买指定商品");
                 } else {
-                    coupon.setDesc("全商城商品通用");
+                    coupon.setCouponDesc("全商城商品通用");
                 }
             } else if (coupon.getCouponType() == 1) {
                 coupon.setCouponName("品类券" + couponName);
                 if ("1".equals(coupon.getCategoryType())) {
-                    coupon.setDesc("仅可购买产品类商品");
+                    coupon.setCouponDesc("仅可购买产品类商品");
                 } else {
-                    coupon.setDesc("仅可购买仪器类商品");
+                    coupon.setCouponDesc("仅可购买仪器类商品");
                 }
             } else if (coupon.getCouponType() == 2) {
                 coupon.setCouponName("用户专享券" + couponName);
-                coupon.setDesc("全商城商品通用");
+                coupon.setCouponDesc("全商城商品通用");
             } else if (coupon.getCouponType() == 3) {
                 NewCmShop cmShop = newCmShopDao.get(coupon.getShopId().toString());
                 if (cmShop != null) {
@@ -2218,11 +2218,11 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                         shopName = shopName.substring(0, 9) + "...";
                     }
                     coupon.setCouponName("店铺券" + couponName);
-                    coupon.setDesc("仅可购买店铺【" + shopName + "】的商品");
+                    coupon.setCouponDesc("仅可购买店铺【" + shopName + "】的商品");
                 }
             } else if (coupon.getCouponType() == 4) {
                 coupon.setCouponName("新用户券" + couponName);
-                coupon.setDesc("全商城商品通用");
+                coupon.setCouponDesc("全商城商品通用");
             }
         });
         map.put("couponList", couponList);