Parcourir la source

//coupon html

release_toaliyun_real
xhxu il y a 3 ans
Parent
révision
9988af0872
2 fichiers modifiés avec 10 ajouts et 2 suppressions
  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 Voir le fichier

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


+ 5
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Voir le fichier

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


Chargement…
Annuler
Enregistrer