| @@ -179,6 +179,14 @@ public class WxCouponController extends BaseController { | |||||
| if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ | if(wxCoupon.getValidEndDate()!=null && wxCoupon.getValidEndDate().before(coupon.getValidEndDate())){ | ||||
| return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); | return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); | ||||
| } | } | ||||
| if(DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) | |||||
| && wxCoupon.getInventory().equals(coupon.getInventory()) | |||||
| || | |||||
| (DateUtils.format(wxCoupon.getValidEndDate()).equals(DateUtils.format(coupon.getValidEndDate())) && | |||||
| wxCoupon.getValidDays().equals(coupon.getValidDays())) | |||||
| ){ | |||||
| return new ResultData(ErrorCode.COUPON_STOCK_VALID_DATE_SETTING_ERR); | |||||
| } | |||||
| } | } | ||||
| //启动审批流 | //启动审批流 | ||||
| @@ -100,6 +100,10 @@ public class TenantInfoImpl implements TenantInfo { | |||||
| return true; | return true; | ||||
| if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) | if ("com.iformall.mapper.WxActivityJoinMapper.updateStatus".equals(ms.getId())) | ||||
| return true; | return true; | ||||
| if ("com.iformall.mapper.WxCouponMapper.findCouponList".equals(ms.getId())) | |||||
| return true; | |||||
| if ("com.iformall.mapper.WxCouponMapper.findCouponListCount".equals(ms.getId())) | |||||
| return true; | |||||
| return false; | return false; | ||||
| } | } | ||||
| } | } | ||||
| @@ -87,6 +87,10 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| String startdate = paramsMap.get("startdate"); | String startdate = paramsMap.get("startdate"); | ||||
| String enddate = paramsMap.get("enddate"); | String enddate = paramsMap.get("enddate"); | ||||
| if(chart == null){ | |||||
| return new ResultData(ErrorCode.REPORT_TYPE_UNKNOWN); | |||||
| } | |||||
| if (StringUtils.isEmpty(startdate)) { | if (StringUtils.isEmpty(startdate)) { | ||||
| startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; | startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; | ||||
| } else { | } else { | ||||