xiaohanzi 5 лет назад
Родитель
Сommit
a28535dcf3
6 измененных файлов: 5 добавлений и 12 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  3. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java
  5. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java Просмотреть файл

@@ -323,9 +323,9 @@ public class WxProjectConfigController extends BaseController {
if(StringUtils.isBlank(wxMsgConfig.getTenantId())){ if(StringUtils.isBlank(wxMsgConfig.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); 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){ if(wxMsgConfig.getSmsChannel() == null){
wxMsgConfig.setSmsChannel(EnumSMSChannel.WIWIDE.getCode()); wxMsgConfig.setSmsChannel(EnumSMSChannel.WIWIDE.getCode());
} }


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Просмотреть файл

@@ -176,7 +176,7 @@ public class WxUserGrantController extends BaseController {
if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ if(StringUtils.isNotBlank(wxMall.getParentTenantId())){
mallList = mallService.getSubByParentTenantId(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()); mallList = mallService.getSubByParentTenantId(wxMall.getTenantId());
} }
if(mallList != null && mallList.size() >0){ if(mallList != null && mallList.size() >0){


+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java Просмотреть файл

@@ -40,8 +40,6 @@ public class WxAppinfo extends BaseTenantEntity {
private Integer type; private Integer type;
@io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId")
private Long 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") @io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable")
private Integer enable; private Integer enable;
@io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat")


+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxAuthorizerInfo.java Просмотреть файл

@@ -69,8 +69,6 @@ public class WxAuthorizerInfo extends BaseTenantEntity {
private String accessToken; private String accessToken;
@io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire") @io.swagger.annotations.ApiModelProperty(value="accessToken过期时间",name="accessTokenExpire")
private Date 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") @io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable")
private Integer enable; private Integer enable;


+ 0
- 3
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") @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="verifynotifyurl")
private String 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") @io.swagger.annotations.ApiModelProperty(value="发短信渠道0:wiwidi; 11:aliyun",name="smsChannel")
private Integer smsChannel; private Integer smsChannel;


+ 1
- 1
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.setNotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemsg/" + tenantId);
wxMsgConfig.setModelnotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemodel/" + tenantId); wxMsgConfig.setModelnotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receivemodel/" + tenantId);
wxMsgConfig.setVerifynotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receiveverifymodel/" + tenantId); wxMsgConfig.setVerifynotifyurl("https://admin.malls.iformall.com/wxMsgCallback/receiveverifymodel/" + tenantId);
wxMsgConfig.setAppid(wxProjectConfig.getAppIdB());
//wxMsgConfig.setAppid(wxProjectConfig.getAppIdB());
wxMsgConfigMapper.insert(wxMsgConfig); wxMsgConfigMapper.insert(wxMsgConfig);
} }




Загрузка…
Отмена
Сохранить