浏览代码

Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

傅行帆 5 年前
父节点
当前提交
e8625233e6

+ 0
- 9
src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java 查看文件

@@ -10,18 +10,11 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
10 10
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
11 11
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
12 12
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
13
-import com.huiju.estateagents.center.taUser.entity.TaUser;
14
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
15 13
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
16 14
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
17 15
 import com.huiju.estateagents.common.CommConstant;
18 16
 import com.huiju.estateagents.common.JWTUtils;
19 17
 import com.huiju.estateagents.common.MD5Utils;
20
-import com.huiju.estateagents.common.StringUtils;
21
-import com.huiju.estateagents.entity.TaNewsType;
22
-import io.swagger.annotations.ApiImplicitParam;
23
-import io.swagger.annotations.ApiImplicitParams;
24
-import io.swagger.annotations.ApiOperation;
25 18
 import org.slf4j.Logger;
26 19
 import org.slf4j.LoggerFactory;
27 20
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +22,6 @@ import org.springframework.web.bind.annotation.*;
29 22
 
30 23
 import javax.servlet.http.HttpServletRequest;
31 24
 import java.time.LocalDateTime;
32
-import java.time.LocalTime;
33
-import java.util.Date;
34 25
 import java.util.HashMap;
35 26
 import java.util.Map;
36 27
 

+ 1
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java 查看文件

@@ -440,6 +440,7 @@ public class CommConstant {
440 440
 	public static final Object GROUP_ACTIVITY = "groupActivity";
441 441
 	public static final String TARGET_TYPE_H5 = "H5";
442 442
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
443
+    public static final String DRAINAGE_QRCODE = "{\"scene\":\"h5id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
443 444
     
444 445
     /**
445 446
      * 消息通知

+ 2
- 2
src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java 查看文件

@@ -142,11 +142,11 @@ public class TaDrainageController extends BaseController {
142 142
                 taMiniappQuery.eq("org_id",getOrgId(request));
143 143
                 TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
144 144
                 // 生成二维码
145
-                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
145
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
146 146
                 taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
147 147
                 iTaDrainageService.updateById(taDrainage);
148 148
 
149
-                //添加第三方appid和secret
149
+                //添加第三方appid和secretis
150 150
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
151 151
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
152 152
                 taThirdPartyMiniappConfig.setAppid(getUUIDS());

src/main/resources/application-test.yml → src/main/resources/application-green.yml 查看文件


+ 10
- 4
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

@@ -621,12 +621,18 @@ FROM
621 621
         a.name AS name,
622 622
         a.phone as phone,
623 623
         if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
624
-        b.name as consultantName,
625
-        b.tel as consultTel
624
+        CASE
625
+        WHEN b.NAME IS NULL THEN
626
+        c.NAME ELSE b.NAME
627
+        END AS consultantName,
628
+        CASE
629
+        WHEN b.tel IS NULL THEN
630
+        c.tel ELSE b.tel
631
+        END AS consultTel
626 632
         FROM
627 633
         ta_recommend_customer a
628
-        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
629
-        LEFT JOIN ta_person c on a.recommend_person = c.person_id
634
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
635
+        left join ta_person c on a.realty_consultant = c.user_id
630 636
         <where>
631 637
             a.status > 0
632 638
             and a.verify_status = 1