diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java b/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java index 819a00ae0..88c84d1d6 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumEnableType.java @@ -8,7 +8,8 @@ public enum EnumEnableType { // 0:启用 1:停用 Enable(0, "启用"), - Disable(1, "停用") + Disable(1, "停用"), + Auditing(2, "审核"), ; public static EnumEnableType getEnum(Integer code) { diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java index 8e1b0f85e..5dfdf07e5 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/BaseController.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.douyin.miniapp.api.TtMaService; +import com.iformall.enums.EnumEnableType; import com.iformall.exception.MallinkException; import com.iformall.service.CUserTokenService; import com.iformall.service.WxAppinfoService; @@ -88,6 +89,14 @@ public class BaseController { return tenantEntity; } + public Integer getAppEnable(){ + String key = "webapp:enable:"+this.getTenantInfo().getTenantId(); + if(objectCommonRedisTemplate.hasKey(key)){ + return EnumEnableType.Auditing.getCode(); + } + return null; + } + /** * 用于查询内容(集团) * @return diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java index d4bfc13f6..ee02b39d9 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java @@ -53,8 +53,12 @@ public class TtCouponController extends BaseController { public ResultData list(@ModelAttribute TtCoupon record, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] TtCouponController::list"); if (record == null) record = new TtCoupon(); + if(getAppEnable() != null){ + record.setIsPayment(EnumYesOrNo.NO.getCode()); + } record.updateTenantInfo(getParentTenantInfo()); record.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode()); + if(StringUtils.isNotBlank(record.getSortColumn())){ String coryColumn = "c."+record.getSortColumns(); record.setSortColumns(coryColumn); diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java index 7daa5426c..8483c518e 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java @@ -19,6 +19,7 @@ import com.iformall.enums.*; import com.iformall.service.*; import com.iformall.utils.Constant; import com.iformall.utils.IPUtil; +import com.iformall.utils.RedisCacheUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; @@ -82,9 +83,18 @@ public class TtUserGrantController extends BaseController { if(wxAppinfo == null){ return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } - if(!wxAppinfo.getEnable().equals(EnumEnableType.Enable.getCode())){ + if(wxAppinfo.getEnable().equals(EnumEnableType.Disable.getCode())){ return new ResultData(ErrorCode.APP_ID_NOT_ENABLE); } + String key = "webapp:enable:"+wxAppinfo.getTenantId(); + if(wxAppinfo.getEnable().equals(EnumEnableType.Auditing.getCode())){ + resultMap.put("enable",wxAppinfo.getEnable()); + if(!objectCommonRedisTemplate.hasKey(key)){ + RedisCacheUtils.cache(objectCommonRedisTemplate, key, wxAppinfo.getEnable(), 0); + } + }else{ + RedisCacheUtils.removeCache(objectCommonRedisTemplate, key); + } TtMaService ttMaService = getWeappServiceByAppInfo(wxAppinfo);