From a28535dcf341a63ba99238d69b03db119ba04088 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 12 Aug 2020 20:15:18 +0800 Subject: [PATCH] update --- .../controller/basic/WxProjectConfigController.java | 6 +++--- .../java/com/iformall/controller/WxUserGrantController.java | 2 +- .../src/main/java/com/iformall/domain/po/WxAppinfo.java | 2 -- .../main/java/com/iformall/domain/po/WxAuthorizerInfo.java | 2 -- .../src/main/java/com/iformall/domain/po/WxMsgConfig.java | 3 --- .../com/iformall/service/impl/WxMsgConfigServiceImpl.java | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index fb6f06f2f..fe07d6e2e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -323,9 +323,9 @@ public class WxProjectConfigController extends BaseController { if(StringUtils.isBlank(wxMsgConfig.getTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if(StringUtils.isBlank(wxMsgConfig.getAppid())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } + //if(StringUtils.isBlank(wxMsgConfig.getAppid())){ + // return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + //} if(wxMsgConfig.getSmsChannel() == null){ wxMsgConfig.setSmsChannel(EnumSMSChannel.WIWIDE.getCode()); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index b67e7c8af..f67dd04cb 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -176,7 +176,7 @@ public class WxUserGrantController extends BaseController { if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ mallList = mallService.getSubByParentTenantId(wxMall.getParentTenantId()); } - if (wxAuthorizerInfo.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { + if (wxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { mallList = mallService.getSubByParentTenantId(wxMall.getTenantId()); } if(mallList != null && mallList.size() >0){ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index 12e47d62a..459bd3363 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -40,8 +40,6 @@ public class WxAppinfo extends BaseTenantEntity { private Integer type; @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") private Long payBillId; - @io.swagger.annotations.ApiModelProperty(value="集团支持(0:不支持,1支持)",name="groupSupport") - private Integer groupSupport; @io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable") private Integer enable; @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java index 44fa9e6b1..8d222eb82 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java @@ -69,8 +69,6 @@ public class WxAuthorizerInfo extends BaseTenantEntity { private String accessToken; @io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire") private Date accessTokenExpire; - @io.swagger.annotations.ApiModelProperty(value="集团支持(0:不支持,1支持)",name="groupSupport") - private Integer groupSupport; @io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable") private Integer enable; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 8d5eb10d3..65eac003e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -41,9 +41,6 @@ public class WxMsgConfig extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="verifynotifyurl") private String verifynotifyurl; - @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") - private String appid; - @io.swagger.annotations.ApiModelProperty(value="发短信渠道0:wiwidi; 11:aliyun",name="smsChannel") private Integer smsChannel; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java index d9c0a5c1f..ae2932080 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java @@ -47,7 +47,7 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { wxMsgConfig.setNotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemsg/" + tenantId); wxMsgConfig.setModelnotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemodel/" + tenantId); wxMsgConfig.setVerifynotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receiveverifymodel/" + tenantId); - wxMsgConfig.setAppid(wxProjectConfig.getAppIdB()); + //wxMsgConfig.setAppid(wxProjectConfig.getAppIdB()); wxMsgConfigMapper.insert(wxMsgConfig); }