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

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -10,18 +10,11 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
 import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaNewsType;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +22,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

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

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

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

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -621,12 +621,18 @@ FROM
         a.name AS name,
         a.phone as phone,
         if(a.sex = 1, '男', if(a.sex = 2, '女', '未知')) as sex,
-        b.name as consultantName,
-        b.tel as consultTel
+        CASE
+        WHEN b.NAME IS NULL THEN
+        c.NAME ELSE b.NAME
+        END AS consultantName,
+        CASE
+        WHEN b.tel IS NULL THEN
+        c.tel ELSE b.tel
+        END AS consultTel
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
-        LEFT JOIN ta_person c on a.recommend_person = c.person_id
+        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        left join ta_person c on a.realty_consultant = c.user_id
         <where>
             a.status > 0
             and a.verify_status = 1