change sms url

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
@@ -84,6 +85,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaDrainageMapper taDrainageMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -309,6 +313,31 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
 //        }
 
+        if (StringUtils.isEmpty(params.getString("realtyConsultant"))) {
+            return ResponseBean.error("置业顾问不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 查找置业顾问对应的 TaPerson 及 TaUser
+        TaPerson consultantPerson = taPersonMapper.selectById(params.getString("realtyConsultant"));
+        TaUser consultantUser = null;
+        if (null == consultantPerson) {
+            consultantUser = taUserMapper.selectById(params.getString("realtyConsultant"));
+            if (null != consultantUser && null != consultantUser.getUserId() && consultantUser.getUserId() > 0) {
+                QueryWrapper<TaPerson> query = new QueryWrapper<>();
+                query.eq("org_id", consultantUser.getOrgId());
+                query.eq("user_id", consultantUser.getUserId());
+                query.last("limit 1");
+                consultantPerson = taPersonMapper.selectOne(query);
+            }
+        } else {
+            consultantUser = taUserMapper.selectById(params.getString("realtyConsultant"));
+        }
+
+        if (null == consultantUser || consultantUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
@@ -316,7 +345,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
-        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
+        taRecommendCustomer.setRealtyConsultant(consultantUser.getUserId().toString());
         //如果没有传building_id的情况构造building_id
         if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))){
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
@@ -377,14 +406,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             String conName = "";
             TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
             if (null != conPerson){
-                if(params.getString("realtyConsultant").equals(conPerson.getPersonId())){
+                if(null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())){
                    return  ResponseBean.success("bound");
                 }
                 conName = conPerson.getName();
             }else {
                 TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
                 if(null != conUser){
-                    if(params.getString("realtyConsultant").equals(conUser.getUserId().toString())){
+                    if(consultantUser.getUserId().equals(conUser.getUserId())){
                         return ResponseBean.success("bound");
                     }
                     conName = conUser.getUserName();

src/main/resources/application-prod.yml

@@ -49,7 +49,8 @@ ali:
 
 # 手机短信服务
 sms:
-  url: http://micservice.ycjcjy.com/sms
+  # 先使用外网地址, 后期使用内网地址
+  url: http://101.200.84.17:8081/sms
   method: POST
   contentType: "application/json;charset=UTF-8"
   template:

src/main/resources/application-test.yml

@@ -50,7 +50,7 @@ ali:
 
 # 手机短信服务
 sms:
-  url: http://micservice.ycjcjy.com/sms
+  url: http://101.200.84.17:8081/sms
   method: POST
   contentType: "application/json;charset=UTF-8"
   template: