From 9bd7ce4d7524051733c6e6f23bde8dd9e96b7f7e Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 11 May 2023 16:47:09 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 2c0d24a03..c2192cb92 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -72,10 +72,8 @@ public class WxCouponController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); wxCoupon.updateTenantInfo(getTenantInfo()); - if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - } wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ String coryColumn = "c."+wxCoupon.getSortColumns(); @@ -178,7 +176,7 @@ public class WxCouponController extends BaseController { } WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),getTenantInfo().getTenantId()); - if(coupon.getSourceType().intValue() != EnumCouponSourceType.COUPONSource_Bapi.getCode().intValue()){ + if(!EnumCouponSourceType.COUPONSource_Bapi.getCode().equals(coupon.getSourceType())){ return new ResultData(Result.ERROR,"非B端券,不能进行此操作"); } @@ -423,6 +421,7 @@ public class WxCouponController extends BaseController { wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon, tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { if (coupon.getSaleAmount() == null) { @@ -481,6 +480,7 @@ public class WxCouponController extends BaseController { wxCoupon.updateTenantInfo(tenantEntity); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); + PageInfo pages = wxCouponService.findPressData(wxCoupon,tenantEntitys,pageNum,pageSize); return new ResultData(pages); }