协销展示机构画像

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -573,6 +573,18 @@ public class ClubApi {
         return clubService.recordDetail(clubId, accessDate, ip, pageNum, pageSize);
     }
 
+    /**
+     * 机构初始出局
+     * @param clubId
+     * @return
+     */
+    @GetMapping("/clubInitial")
+    public ResponseJson selTotal(Integer clubId) {
+        if (null == clubId) {
+            return ResponseJson.error("机构id不能为空",null);
+        }
+        return clubService.selTotal(clubId);
+    }
     /**
      * 机构画像
      * @param cmPortrait

src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -354,6 +354,8 @@ public interface ClubMapper {
 
     Integer findLeaderIdBySp(Integer spId);
 
+    CmPortraitDto selTotal(Integer clubId);
+
     List<RecordVo> accessRecords(Integer clubId);
 
     List<BehaviorRecodeVo> recordDetail(@Param("clubId") Integer clubId, @Param("accessDate") String accessDate);

src/main/java/com/caimei365/user/service/ClubService.java

@@ -283,5 +283,7 @@ public interface ClubService {
 
     ResponseJson recordDetail(Integer clubId, String accessDate,String ip,Integer pageNum, Integer pageSize);
 
+    ResponseJson selTotal(Integer clubId);
+
     ResponseJson dataList(CmPortraitDto cmPortrait);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -127,6 +127,19 @@ public class ClubServiceImpl implements ClubService {
         if (club == null) {
             return ResponseJson.error("机构信息不存在", null);
         }
+        if (null != club.getTownId()) {
+            TownVo town = baseMapper.getTown(club.getTownId());
+            CityVo city = baseMapper.getCity(town.getCityId());
+            ProvinceVo province = baseMapper.getProvince(city.getProvinceId());
+            club.setCityId(city.getCityId());
+            club.setProvinceId(province.getProvinceId());
+            club.setProvincialAddress(province.getName() + "" + city.getName() + "" + town.getName());
+        }
+        log.info("销售人名称" + saleName);
+        log.info("销售人id" + club.getServiceProviderId());
+        Map<String, Object> map = new HashMap(2);
+        map.put("club", club);
+        map.put("saleName", saleName);
         // 是否失效 有效时间3天
         String addTime = clubMapper.selAddTime(clubId);
         if (StringUtils.isNotBlank(addTime)) {
@@ -145,22 +158,11 @@ public class ClubServiceImpl implements ClubService {
             long timeNew = calendar.getTime().getTime();
             int day = (int)(timeNew - timeOld) / 1000 / 60 / 60 / 24;
             if (day > 3) {
-                return ResponseJson.error("链接时间已过期，请重新生成",null);
+                map.put("lostType",1);
+            } else {
+                map.put("lostType",0);
             }
         }
-        if (null != club.getTownId()) {
-            TownVo town = baseMapper.getTown(club.getTownId());
-            CityVo city = baseMapper.getCity(town.getCityId());
-            ProvinceVo province = baseMapper.getProvince(city.getProvinceId());
-            club.setCityId(city.getCityId());
-            club.setProvinceId(province.getProvinceId());
-            club.setProvincialAddress(province.getName() + "" + city.getName() + "" + town.getName());
-        }
-        log.info("销售人名称" + saleName);
-        log.info("销售人id" + club.getServiceProviderId());
-        Map<String, Object> map = new HashMap(2);
-        map.put("club", club);
-        map.put("saleName", saleName);
         return ResponseJson.success(map);
     }
 
@@ -2105,6 +2107,13 @@ public class ClubServiceImpl implements ClubService {
         return ResponseJson.success(pageInfo);
     }
 
+    @Override
+    public ResponseJson selTotal(Integer clubId) {
+        // 查询机构画像总数据
+        CmPortraitDto cmPortraitDto = clubMapper.selTotal(clubId);
+        return ResponseJson.success(cmPortraitDto);
+    }
+
     @Override
     public ResponseJson dataList(CmPortraitDto cmPortrait) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -2208,8 +2217,8 @@ public class ClubServiceImpl implements ClubService {
                         orderScopeTotalFee += order.getPayTotalFee();
                     }
                 }
-                cmPortrait.setOrderTotal(length);
-                cmPortrait.setOrderTotalAmount(new BigDecimal(orderList.get(0).getTotalMoney()));
+                /*cmPortrait.setOrderTotal(length);
+                cmPortrait.setOrderTotalAmount(new BigDecimal(orderList.get(0).getTotalMoney()));*/
                 // 当前单位订单总额
                 cmPortrait.setOrderScopeTotalFee(Double.valueOf(String.format("%.2f", orderScopeTotalFee)));
 
@@ -2301,14 +2310,15 @@ public class ClubServiceImpl implements ClubService {
                     } else {
                         strings.add("未知");
                     }
-                    cmPortrait.setTotalKeywords(behaviorRecordList.get(0).getNumbers());
+//                    cmPortrait.setTotalKeywords(behaviorRecordList.get(0).getNumbers());
                     cmPortrait.setBehaviorValue(integers);
                     cmPortrait.setBehaviorType(strings);
 
                 }
-            } else {
-                cmPortrait.setTotalKeywords(0);
             }
+            /*else {
+                cmPortrait.setTotalKeywords(0);
+            }*/
             cmPortrait.setKeyWordsScopeNum(keywordsTotal);
         }
         // 咨询记录
@@ -2367,14 +2377,14 @@ public class ClubServiceImpl implements ClubService {
                         }
                     }
                 }
-                cmPortrait.setRemarksTotal(remarksList.get(0).getNumbers());
+//                cmPortrait.setRemarksTotal(remarksList.get(0).getNumbers());
                 cmPortrait.setRemarksValue(integers);
                 cmPortrait.setRemarksType(strings);
 
                 cmPortrait.setRemarksScopeNum(remarksList.size());
             } else {
                 cmPortrait.setRemarksScopeNum(0);
-                cmPortrait.setRemarksTotal(0);
+//                cmPortrait.setRemarksTotal(0);
             }
             calendar.setTime(date);
             calendar.add(Calendar.DAY_OF_MONTH, -1);

src/main/resources/mapper/ClubMapper.xml

@@ -1014,8 +1014,20 @@
         LEFT JOIN cm_serviceteam_group csg ON csr.id=csg.teamId
         WHERE csg.serviceId = #{spId}
     </select>
+    <select id="selTotal" resultType="com.caimei365.user.model.dto.CmPortraitDto">
+        SELECT
+            (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubId} AND orderTime <![CDATA[ < ]]> now()) AS orderTotal,
+            (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubId} AND orderTime <![CDATA[ < ]]> now()) AS orderTotalAmount,
+            (SELECT COUNT(cbr.recordID) FROM cm_behavior_record cbr LEFT JOIN club c ON cbr.userID = c.userID WHERE cbr.pageType IN (8, 9) AND c.clubID = #{clubId} AND cbr.accessDate <![CDATA[ < ]]> now()) AS totalkeywords ,
+            (SELECT COUNT(remarks) FROM cm_club_remarks WHERE clubID = #{clubId} AND addTime <![CDATA[ < ]]> now()) AS remarksTotal
+    </select>
     <select id="accessRecords" resultType="com.caimei365.user.model.vo.RecordVo">
-        SELECT accessDate,number,IP as ip FROM cm_behavior_record_index WHERE clubID = #{clubId} AND delFlag = 0
+        SELECT accessDate,COUNT(cbr.recordID) AS number,IP AS ip
+        FROM cm_behavior_record cbr
+        LEFT JOIN club c ON cbr.userID = c.userID
+        WHERE cbr.delFlag = 0
+          AND c.clubID = #{clubId}
+        GROUP BY cbr.IP, cbr.accessDate ORDER BY cbr.accessDate DESC
     </select>
     <select id="recordDetail" resultType="com.caimei365.user.model.vo.BehaviorRecodeVo">
         SELECT
@@ -1031,12 +1043,14 @@
          LEFT JOIN club c ON b.userID = c.userID
          LEFT JOIN product p ON b.productID = p.productID
          LEFT JOIN cm_page_type pt ON b.pageType = pt.id
-        WHERE c.clubID = #{clubId} AND b.accessDate = #{accessDate}
+        WHERE c.clubID = #{clubId} AND b.accessDate = #{accessDate} order by b.accessTime desc
     </select>
     <select  id="selOrderList" resultType="com.caimei365.user.model.po.NewOrderPo">
         SELECT
         (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubId}) as numbers,
         (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubId}) as totalMoney,
+        (SELECT COUNT(orderID) FROM cm_order WHERE clubID = #{clubId} AND orderTime <![CDATA[ < ]]> now()) AS orderTotal,
+        (SELECT SUM(payTotalFee) FROM cm_order WHERE clubID = #{clubId} AND orderTime <![CDATA[ < ]]> now()) AS orderTotalAmount,
         clubID,
         secondHandOrderFlag,
         rebateFlag,

src/main/resources/mapper/SellerMapper.xml

@@ -112,12 +112,14 @@
         c.mainpro as mainProduct, c.fax, c.info as profile, c.spID as serviceProviderId, c.addTime, c.status,
         c.lastCheckOrderDate,
         u.userIdentity,c.newDeal as newDeal,IF(r.id IS NOT NULL,1,0) AS recordCount,
+        sp.name AS serviceName,
         covs.activeState AS activeState,
         covs.customerValue AS customerValue
         from club c
         left join user u on c.userID = u.userID
         LEFT JOIN record_link r ON r.`clubId`=c.`clubID`
         LEFT JOIN cm_organ_value_system covs ON covs.userID = u.userID
+        LEFT JOIN serviceprovider sp ON c.spID = sp.serviceProviderID
         where
         <if test="1 == type">
             c.spID = #{serviceProviderId}