Просмотр исходного кода

//coupon html

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
9988af0872
2 измененных файлов: 10 добавлений и 2 удалений
  1. +5
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +5
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java

+ 5
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -551,9 +551,11 @@ public class WxCouponController extends BaseController {
return null;
}
WxCouponCVo couponCVo = new WxCouponCVo();
couponCVo.setId(cc.getId());
// couponCVo.setId(cc.getId());
couponCVo.setCouponId(cc.getCouponId());
couponCVo.setContentType(c.getContentType());
couponCVo.setHtml(c.getHtml());
couponCVo.setRemark(c.getRemark());
return couponCVo;
}else if(couponIdL > 0l){
WxCoupon c = couponService.getHtmlById(couponIdL,tenantId);
@@ -562,7 +564,9 @@ public class WxCouponController extends BaseController {
}
WxCouponCVo couponCVo = new WxCouponCVo();
couponCVo.setCouponId(c.getId());
couponCVo.setContentType(c.getContentType());
couponCVo.setHtml(c.getHtml());
couponCVo.setRemark(c.getRemark());
return couponCVo;
}
return null;


+ 5
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -260,16 +260,20 @@ public class WxCouponOrderController extends BaseController {
}
wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType());
wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml());
wxCouponOrderCVo.setRemark(wxCouponCVo.getRemark());
} else {
WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId(),wxCouponOrderCVo.getTenantId());
if (wxCoupon == null) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}
wxCouponCVo = new WxCouponCVo();
wxCouponCVo.setId(wxCouponOrderCVo.getCouponId());
wxCouponCVo.setId(wxCoupon.getId());
wxCouponCVo.setContentType(wxCoupon.getContentType());
wxCouponCVo.setHtml(wxCoupon.getHtml());
wxCouponCVo.setRemark(wxCoupon.getRemark());
wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType());
wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml());
wxCouponOrderCVo.setRemark(wxCouponCVo.getRemark());
// 插入缓存
operations.set(key, wxCouponCVo, 3600, TimeUnit.SECONDS);
}


Загрузка…
Отмена
Сохранить