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

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -23,11 +23,13 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -94,6 +96,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
 		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
+
+		for (Map map : taUserList){
+			if (map.get("orgId") == null){
+				map.put("userCount", 0);
+				map.put("registeredCount", 0);
+				continue;
+			}
+			Integer userCount = taPersonMapper.selectChannelUserCount(map.get("orgId").toString());
+			Integer registeredCount = taPersonMapper.selectChannelRegisteredCount(map.get("orgId").toString());
+			map.put("userCount", userCount);
+			map.put("registeredCount", registeredCount);
+		}
 		pg.setRecords(taUserList);
 		return pg;
 	}

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

@@ -181,6 +181,14 @@ public class SysUserChannelController extends BaseController {
                 return responseBean;
             }
 
+            QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+            taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
+            Integer countChannel = iTaChannelProxyService.count(taChannelProxyQueryWrapper);
+            if (countChannel > 0){
+                responseBean.addError("手机号已存在");
+                return responseBean;
+            }
+
             taChannelProxy.setStatus(1);
             taChannelProxy.setCreateTime(LocalDateTime.now());
             iTaChannelProxyService.save(taChannelProxy);

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

@@ -12,7 +12,10 @@ import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.service.IExtendContentService;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.models.auth.In;
@@ -60,6 +63,12 @@ public class TaDrainageController extends BaseController {
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -128,6 +137,15 @@ public class TaDrainageController extends BaseController {
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaDrainageService.save(taDrainage)){
+                // 根据ORGID查询当前小程序表的miniapp_id
+                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
+                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());
+                taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+                iTaDrainageService.updateById(taDrainage);
+
                 //添加第三方appid和secret
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -73,7 +73,8 @@ public class TaDrainage implements Serializable {
     private String middleImg ;
     /** 状态 */
     private Integer status ;
-
+    /** 二维码*/
+    private String qrCode;
     @TableField(exist = false)
     private String appid;
     

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -67,6 +67,22 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
     Integer selectRegisteredCount(@Param("org") Integer orgId);
 
+    /**
+     * 渠道代理后台总用户数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org}")
+    Integer selectChannelUserCount(@Param("org") String orgId);
+
+    /**
+     * 渠道代理后台总注册数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org} and phone is not null")
+    Integer selectChannelRegisteredCount(@Param("org") String orgId);
+
     /**
      * 根据时间段查询
      * @param personType

src/main/resources/mapper/TaUserMapper.xml

@@ -21,7 +21,8 @@
             m.token,
             m.NAME AS miniappName,
             m.qr_code AS qrCode,
-            z.expire_date
+            z.expire_date,
+            m.org_id
         FROM
             ta_user t
             LEFT JOIN ta_org o ON t.org_id = o.org_id