|
@@ -140,16 +140,20 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
|
|
String image = UploadPicUtils.saveImageToServer(cmCoupon.getAppletsBanner());
|
|
String image = UploadPicUtils.saveImageToServer(cmCoupon.getAppletsBanner());
|
|
cmCoupon.setAppletsBanner(image);
|
|
cmCoupon.setAppletsBanner(image);
|
|
}
|
|
}
|
|
|
|
+ if (StringUtils.isNotBlank(cmCoupon.getShareCouponImage())) {
|
|
|
|
+ String image = UploadPicUtils.saveImageToServer(cmCoupon.getShareCouponImage());
|
|
|
|
+ cmCoupon.setShareCouponImage(image);
|
|
|
|
+ }
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
cmCoupon.setCreateDate(date);
|
|
cmCoupon.setCreateDate(date);
|
|
setCouponStatus(cmCoupon, date);
|
|
setCouponStatus(cmCoupon, date);
|
|
if (StringUtils.isBlank(cmCoupon.getCouponsMode())) {
|
|
if (StringUtils.isBlank(cmCoupon.getCouponsMode())) {
|
|
cmCoupon.setCouponsMode("0");
|
|
cmCoupon.setCouponsMode("0");
|
|
}
|
|
}
|
|
- if (null == cmCoupon.getVipFlag()){
|
|
|
|
|
|
+ if (null == cmCoupon.getVipFlag()) {
|
|
cmCoupon.setVipFlag(0);
|
|
cmCoupon.setVipFlag(0);
|
|
}
|
|
}
|
|
- if(null==cmCoupon.getMoneyCouponFlag()){
|
|
|
|
|
|
+ if (null == cmCoupon.getMoneyCouponFlag()) {
|
|
cmCoupon.setMoneyCouponFlag(2);
|
|
cmCoupon.setMoneyCouponFlag(2);
|
|
}
|
|
}
|
|
super.save(cmCoupon);
|
|
super.save(cmCoupon);
|
|
@@ -334,8 +338,8 @@ public class CmCouponService extends CrudService<CmCouponDao, CmCoupon> {
|
|
return couponsLogo;
|
|
return couponsLogo;
|
|
}
|
|
}
|
|
|
|
|
|
- public List<CmCoupon> findClubCouponList(Product product,Integer userId,Integer moneyCouponFlag) {
|
|
|
|
- List<CmCoupon> couponList = cmCouponDao.findCouponList(userId,moneyCouponFlag);
|
|
|
|
|
|
+ public List<CmCoupon> findClubCouponList(Product product, Integer userId, Integer moneyCouponFlag) {
|
|
|
|
+ List<CmCoupon> couponList = cmCouponDao.findCouponList(userId, moneyCouponFlag);
|
|
filterCoupon(product, couponList);
|
|
filterCoupon(product, couponList);
|
|
setCouponCopywriting(couponList);
|
|
setCouponCopywriting(couponList);
|
|
return couponList;
|
|
return couponList;
|