diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 760af4a7b..72783f9d9 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -191,13 +191,19 @@ public class WxCUserController extends BaseController { @PostMapping("/findUserInfo") @ApiOperation(value = "获取会员信息", notes = "") public ResultData findUserInfo(@RequestBody WxCUserFromBDto wxCUserFromBDto) { - logger.info("WxCUserController::updateUserInfo"); + logger.info("WxCUserController::findUserInfo"); if (wxCUserFromBDto == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "没有传入用户信息"); } if (StringUtils.isEmpty(wxCUserFromBDto.getOpenid())) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端openid不能为空"); } + if (StringUtils.isEmpty(wxCUserFromBDto.getAppId())) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端appid不能为空"); + } + if (wxCUserFromBDto.getbUserId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "bUserId不能为空"); + } WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); if(wxCUserFromB!=null){ WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getcUserId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java index 7baa423cc..99b3a5274 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxCUserFromBDto.java @@ -23,6 +23,8 @@ public class WxCUserFromBDto implements Serializable { private String address; @io.swagger.annotations.ApiModelProperty(value="C端会员手机号",name="phone") private String phone; + @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") + private Long merchantId; public Long getbUserId() { return bUserId; @@ -87,4 +89,12 @@ public class WxCUserFromBDto implements Serializable { public void setAppId(String appId) { this.appId = appId; } + + public Long getMerchantId() { + return merchantId; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java index b5246120a..02228798c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java @@ -6,7 +6,9 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCUserFromBDto; import com.iformall.domain.po.WxCUserFromB; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.mapper.WxCUserFromBMapper; +import com.iformall.mapper.WxMerchantBUserMapper; import com.iformall.service.WxCUserFromBService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,8 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Autowired WxCUserFromBMapper wxCUserFromBMapper; + @Autowired + WxMerchantBUserMapper wxMerchantBUserMapper; @Override public PageInfo listAsPage(WxCUserFromB record, Integer pageIndex, Integer pageSize) { @@ -56,6 +60,11 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Override public WxCUserFromB getByOpenidAndAppId(WxCUserFromBDto wxCUserFromBDto) { + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(wxCUserFromBDto.getbUserId()); + if (wxMerchantBUser == null) { + return null; + } + wxCUserFromBDto.setMerchantId(wxMerchantBUser.getMerchantId()); return wxCUserFromBMapper.getByOpenidAndAppId(wxCUserFromBDto); } diff --git a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml index 8d65c1c7a..68cfad34b 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml @@ -44,10 +44,11 @@