Browse Source

Merge branch 'dev'

dev_shibei_match
sunyuchao 5 years ago
parent
commit
ad27a56265
  1. 7
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

7
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@ -117,12 +117,12 @@ public class CodeServiceImpl implements CodeService {
if (null == authInfo) { if (null == authInfo) {
throw new RenException("未授权"); throw new RenException("未授权");
} }
CustomerDTO customerFormDTO = new CustomerDTO(); /*CustomerDTO customerFormDTO = new CustomerDTO();
customerFormDTO.setId(formDTO.getCustomerId()); customerFormDTO.setId(formDTO.getCustomerId());
Result<CustomerDTO> result = operCrmOpenFeignClient.getCustomerInfo(customerFormDTO); Result<CustomerDTO> result = operCrmOpenFeignClient.getCustomerInfo(customerFormDTO);
if (!result.success()) { if (!result.success()) {
throw new RenException(result.getCode(), result.getMsg()); throw new RenException(result.getCode(), result.getMsg());
} }*/
//获取小程序居民端与工作端名称 //获取小程序居民端与工作端名称
String resiName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.RESI); String resiName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.RESI);
String workName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.WORK); String workName = miniInfoDao.getNickName(formDTO.getCustomerId(), CodeConstant.WORK);
@ -132,7 +132,8 @@ public class CodeServiceImpl implements CodeService {
wxExtJson.getExt().setExtAppid(authInfo.getAuthorizerAppid()); wxExtJson.getExt().setExtAppid(authInfo.getAuthorizerAppid());
wxExtJson.getExt().setResiName(resiName); wxExtJson.getExt().setResiName(resiName);
wxExtJson.getExt().setWorkName(workName); wxExtJson.getExt().setWorkName(workName);
wxExtJson.getExt().setCustomerName(null == result.getData().getCustomerName()?"":result.getData().getCustomerName()); //wxExtJson.getExt().setCustomerName(null == result.getData().getCustomerName()?"":result.getData().getCustomerName());
wxExtJson.getExt().setCustomerName("");
if (CodeConstant.RESI.equals(formDTO.getClientType())) { if (CodeConstant.RESI.equals(formDTO.getClientType())) {
wxExtJson.getWindow().setNavigationBarTitleText(resiName); wxExtJson.getWindow().setNavigationBarTitleText(resiName);
} else { } else {

Loading…
Cancel
Save