|
|
|
@@ -96,7 +96,7 @@ public class WxCouponController extends BaseController { |
|
|
|
wxCoupon.updateTenantInfo(tenantEntity); |
|
|
|
|
|
|
|
if(null == wxCoupon.getSourceType()){ |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); |
|
|
|
} |
|
|
|
|
|
|
|
ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); |
|
|
|
@@ -121,9 +121,6 @@ public class WxCouponController extends BaseController { |
|
|
|
if (wxCoupon.getId() == null) { |
|
|
|
return new ResultData(ResultData.ERROR, "缺少id"); |
|
|
|
} |
|
|
|
if(null == wxCoupon.getSourceType()){ |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
} |
|
|
|
wxCoupon.updateTenantInfo(getTenantInfo()); |
|
|
|
if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ |
|
|
|
WxCouponChannel query = new WxCouponChannel(); |
|
|
|
@@ -302,7 +299,7 @@ public class WxCouponController extends BaseController { |
|
|
|
if (wxCoupon.getEnddate() == null) { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); |
|
|
|
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon, pageNum, pageSize); |
|
|
|
for (WxCouponStatisVo coupon : pageInfo.getList()) { |
|
|
|
if (coupon.getSaleAmount() == null) { |
|
|
|
@@ -334,7 +331,7 @@ public class WxCouponController extends BaseController { |
|
|
|
wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); |
|
|
|
} |
|
|
|
|
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); |
|
|
|
|
|
|
|
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, pageNum, pageSize); |
|
|
|
for (WxCouponStatisVo coupon : pageInfo.getList()) { |
|
|
|
@@ -356,7 +353,7 @@ public class WxCouponController extends BaseController { |
|
|
|
public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { |
|
|
|
Map<String,Object> result = new HashedMap(); |
|
|
|
wxCoupon.updateTenantInfo(getTenantInfo()); |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); |
|
|
|
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); |
|
|
|
PageInfo<WxCouponStatisVo> pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); |
|
|
|
return new ResultData(pages); |
|
|
|
} |
|
|
|
|