diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 44356b74c..f1b1abb1d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -106,9 +106,12 @@ public class WxCouponController extends BaseController { private ResultData couponList(WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) { //默认A端建券 - if(null == wxCoupon.getSourceType()){ + if(wxCoupon.getSourceType() == null){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + }else if(wxCoupon.getSourceType() == -1){ + wxCoupon.setSourceType(null); } + //排序处理 if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ String coryColumn = "c."+wxCoupon.getSortColumns(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index d0c973127..2c0d24a03 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -201,10 +201,8 @@ public class WxCouponController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::add"); TenantEntity tenantEntity = getTenantInfo(); wxCoupon.updateTenantInfo(tenantEntity); + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); - } List merchantList = new ArrayList<>(); WxMerchant wxMerchant = wxMerchantService.getById(getLoginBUser().getMerchantId()); merchantList.add(wxMerchant); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSourceType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSourceType.java index 92f23e28c..51ab2b59b 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponSourceType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponSourceType.java @@ -5,9 +5,9 @@ package com.iformall.enums; */ public enum EnumCouponSourceType { - // 1:A端发卷,2:B端发卷 - COUPONSource_Admin(1, "A端发卷"), - COUPONSource_Bapi(2, "B端发卷") + // 1:A端建券,2:B端建券 + COUPONSource_Admin(1, "A端建券"), + COUPONSource_Bapi(2, "B端建券") ; public static EnumCouponSourceType getEnum(Integer code) {