From 08346c8accf352eda47cfcb79e8efd59109f5612 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 20 Jul 2020 17:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8C=E7=94=9F=E4=BA=BA=E6=90=9C=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4customerId->appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/PublicCustomerResultDTO.java | 22 +++++++++++++++++++ .../epmet/feign/EpmetThirdFeignClient.java | 12 +++++++++- .../EpmetThirdFeignClientFallback.java | 6 +++++ .../java/com/epmet/constant/PaConstant.java | 4 ++++ .../controller/CustomerMpController.java | 12 ++++++++++ .../java/com/epmet/dao/CustomerMpDao.java | 9 ++++++++ .../com/epmet/service/CustomerMpService.java | 9 ++++++++ .../service/impl/CustomerMpServiceImpl.java | 22 +++++++++++++++++++ .../main/resources/mapper/CustomerMpDao.xml | 14 ++++++++++++ .../form/PublicCustomerGridListFormDTO.java | 6 ++--- .../resi-guide/resi-guide-server/pom.xml | 6 +++++ .../impl/StrangerAccessRecordServiceImpl.java | 15 ++++++++++++- 12 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/PublicCustomerResultDTO.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/PublicCustomerResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/PublicCustomerResultDTO.java new file mode 100644 index 0000000000..36a820f939 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/PublicCustomerResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import com.epmet.dto.PaCustomerDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * 根据appid查询公众号注册的客户信息 + * @Author sun + */ +@Data +public class PublicCustomerResultDTO implements Serializable { + + private static final long serialVersionUID = 4642988014737245076L; + + /** + * 客户信息 + */ + private PaCustomerDTO customer; + +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java index a0e14b9d51..ce37bcdaac 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java @@ -7,6 +7,7 @@ import com.epmet.dto.form.SaveUserVisitedFormDTO; import com.epmet.dto.form.WxLoginFormDTO; import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.InitCustomerResultDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.dto.result.SaveUserResultDTO; import com.epmet.feign.fallback.EpmetThirdFeignClientFallback; import me.chanjar.weixin.mp.bean.result.WxMpUser; @@ -94,5 +95,14 @@ public interface EpmetThirdFeignClient { * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 **/ @PostMapping(value = "third/customermp/resiandworklogin") - Result resiAndWorkLogin(WxLoginFormDTO formDTO); + Result resiAndWorkLogin(@RequestBody WxLoginFormDTO formDTO); + + /** + * @param appId + * @return + * @Author sun + * @Description 根据appId查询公众号注册的客户信息 + **/ + @PostMapping(value = "third/customermp/getcustomermsg") + Result getCustomerMsg(@PathVariable("appId") String appId); } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java index 791c133589..fda713210f 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java @@ -8,6 +8,7 @@ import com.epmet.dto.form.SaveUserVisitedFormDTO; import com.epmet.dto.form.WxLoginFormDTO; import com.epmet.dto.result.CustomerUserResultDTO; import com.epmet.dto.result.InitCustomerResultDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.dto.result.SaveUserResultDTO; import com.epmet.feign.EpmetThirdFeignClient; import me.chanjar.weixin.mp.bean.result.WxMpUser; @@ -59,4 +60,9 @@ public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient { public Result resiAndWorkLogin(WxLoginFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "resiAndWorkLogin", formDTO); } + + @Override + public Result getCustomerMsg(String appId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_THIRD_SERVER, "getCustomerMsg", appId); + } } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java index be2c5de556..cbed19f1c2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java @@ -62,4 +62,8 @@ public interface PaConstant { * 获取缓存中token信息失败 */ String TOKEN_EXCEPTION = "token已过期"; + /** + * 获取客户信息失败 + */ + String SELECT_CUSTOMER_EXCEPTION = "获取客户信息失败"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java index 24fac10967..4abc2f22f1 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CustomerMpController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerMpDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.WxLoginFormDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.excel.CustomerMpExcel; import com.epmet.service.CustomerMpService; import org.springframework.beans.factory.annotation.Autowired; @@ -104,4 +105,15 @@ public class CustomerMpController { return new Result().ok(customerMpService.resiAndWorkLogin(formDTO)); } + /** + * @param appId + * @return + * @Author sun + * @Description 根据appId查询公众号注册的客户信息 + **/ + @PostMapping("getcustomermsg") + public Result getCustomerMsg(@PathVariable("appId") String appId) { + return new Result().ok(customerMpService.getCustomerMsg(appId)); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java index 63e8a0befa..593194e2c7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CustomerMpDao.java @@ -19,6 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerMpDTO; +import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.AuthCodeFormDTO; import com.epmet.entity.CustomerMpEntity; import org.apache.ibatis.annotations.Mapper; @@ -98,4 +99,12 @@ public interface CustomerMpDao extends BaseDao { * @Description 根据appId查询小程序信息 **/ CustomerMpDTO selectByAppId(@Param("appId") String appId); + + /** + * @param appId + * @return + * @Author sun + * @Description 根据appId查询客户信息 + **/ + PaCustomerDTO selectCustomerByAppId(@Param("appId") String appId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CustomerMpService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CustomerMpService.java index 11cf845183..35b4245325 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CustomerMpService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CustomerMpService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.CustomerMpDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.WxLoginFormDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.entity.CustomerMpEntity; import java.util.List; @@ -112,4 +113,12 @@ public interface CustomerMpService extends BaseService { * @Description 校验appId是否有效以及是否授权,校验通过的调用微信API获取用户基本信息 **/ UserWechatDTO resiAndWorkLogin(WxLoginFormDTO formDTO); + + /** + * @param appId + * @return + * @Author sun + * @Description 根据appId查询公众号注册的客户信息 + **/ + PublicCustomerResultDTO getCustomerMsg(String appId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java index bbc0efef02..3f13d5e4dc 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CustomerMpServiceImpl.java @@ -26,10 +26,13 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.constant.PaConstant; import com.epmet.dao.CustomerMpDao; import com.epmet.dto.CustomerMpDTO; +import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.WxLoginFormDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.entity.CustomerMpEntity; import com.epmet.redis.CustomerMpRedis; import com.epmet.service.CustomerMpService; @@ -142,4 +145,23 @@ public class CustomerMpServiceImpl extends BaseServiceImpl + + \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java index 80d539dbb2..6e26721f28 100644 --- a/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java +++ b/epmet-module/resi-guide/resi-guide-client/src/main/java/com/epmet/dto/form/PublicCustomerGridListFormDTO.java @@ -22,10 +22,10 @@ public class PublicCustomerGridListFormDTO implements Serializable { } /** - * 客户Id + * 小程序appId * */ - @NotBlank(message = "客户Id不能为空", groups = {AddUserShowGroup.class}) - private String customerId; + @NotBlank(message = "小程序appId不能为空", groups = {AddUserShowGroup.class}) + private String appId; /** * 当前页 * */ diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index b973b88c1c..d93427f6b0 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -81,6 +81,12 @@ snakeyaml ${snakeyaml.version} + + com.epmet + epmet-third-client + 2.0.0 + compile + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java index 14e4f01b8c..e1d44ec93a 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java @@ -14,12 +14,15 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.StrangerResiGuideConstant; import com.epmet.dao.StrangerAccessRecordDao; +import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.StrangerAccessRecordDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; import com.epmet.dto.result.HomeDesignByCustomerResultDTO; import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO; +import com.epmet.dto.result.PublicCustomerResultDTO; import com.epmet.entity.StrangerAccessRecordEntity; +import com.epmet.feign.EpmetThirdFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.OperCustomizeFeignClient; @@ -52,6 +55,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl> thirdCustomerGridList(PublicCustomerGridListFormDTO formDTO) { + //0.调用epmet-third服务，根据appId查询客户信息 + Result result = epmetThirdFeignClient.getCustomerMsg(formDTO.getAppId()); + if(!result.success()){ + throw new RenException(result.getCode()); + } + PublicCustomerResultDTO resultDTO = result.getData(); + PaCustomerDTO customer = resultDTO.getCustomer(); + ThirdCustomerGridListFormDTO third = new ThirdCustomerGridListFormDTO(); - third.setCustomerId(formDTO.getCustomerId()); + third.setCustomerId(customer.getId()); //1.参数设置 //根据是自动定位还是手动定位获取地区编码值 third.setAreaCode(ModuleConstant.NOT_POSITION_AUTHORIZED == formDTO.getIsAuthorized() ?