diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index c9341e365..d6e658972 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -2,11 +2,9 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxBuser; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.WxProfitSharingReceiver; +import com.iformall.domain.po.*; import com.iformall.enums.EnumMsgSend; +import com.iformall.service.WxCUserService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverService; import io.swagger.annotations.Api; @@ -29,6 +27,9 @@ public class WxMerchantController extends BaseController { @Autowired private WxProfitSharingReceiverService wxProfitSharingReceiverService; + @Autowired + private WxCUserService cUserService; + @ApiOperation("查询当前租户下商户名称列表") @GetMapping("/name_list") public ResultData nameList() { @@ -97,6 +98,24 @@ public class WxMerchantController extends BaseController { return new ResultData(has); } + @ApiOperation("获取微信OpenId") + @GetMapping("/getOpenIdByPhone") + @ApiImplicitParam(name = "phone", value = "商户C端注册手机号", dataType = "String", paramType = "query", required = true) + public ResultData getOpenIdByPhone(@ModelAttribute String phone) { + log.debug("[" + getIpAddr() + "] WxMerchantController::getOpenIdByPhone"); + if (!hasPermission()) { + return new ResultData(ErrorCode.USER_NO_PERMISSION); + } + if (StringUtils.isBlank(phone)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户C端注册手机号不能为空"); + } + WxCUser cuUser = new WxCUser(); + cuUser.updateTenantInfo(getTenantInfo()); + cuUser.setPhone(phone); + WxCUser mUser = cUserService.getByObject(cuUser); + return new ResultData(mUser.getOpenId()); + } + public boolean hasPermission() { WxMerchantBUser user = getUser(); WxBuser buser = getBuser(); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index fee496f1e..23be5e82a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -81,7 +81,7 @@ public class WxMerchant extends TenantEntity { } @TableField(exist = false) - @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1"}) + @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1","OPENID_3"}) @io.swagger.annotations.ApiModelProperty(value="账户类型",name="accountTypeValue") private Integer accountTypeValue;