Authored by csgyoho

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

@@ -125,6 +125,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{ @@ -125,6 +125,7 @@ public class CouponServiceImpl implements ICouponService,IBusinessExportService{
125 LOGGER.info("before saveOrUpdateCoupon#deleteByCouponId,couponId is {}",req.getId()); 125 LOGGER.info("before saveOrUpdateCoupon#deleteByCouponId,couponId is {}",req.getId());
126 couponProductLimitMapper.deleteByCouponId(req.getId()); 126 couponProductLimitMapper.deleteByCouponId(req.getId());
127 } 127 }
  128 + req.setSendNum(null == req.getSendNum()?0:req.getSendNum());
128 //TODO 新增和修改暂时都写死的数据 129 //TODO 新增和修改暂时都写死的数据
129 req.setProductLimitType(Coupon.PRODUCTLIMITTYPE_SPECIALPRODUCT); 130 req.setProductLimitType(Coupon.PRODUCTLIMITTYPE_SPECIALPRODUCT);
130 req.setCouponType(100); 131 req.setCouponType(100);