Merge remote-tracking branch 'origin/developer' into developerB

src/main/java/com/caimei365/manager/controller/caimei/user/CmBehaviorRecordApi.java

@@ -17,6 +17,7 @@ import javax.swing.filechooser.FileSystemView;
 import java.io.File;
 import java.net.URLEncoder;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -96,9 +97,9 @@ public class CmBehaviorRecordApi {
      * @return 返回
      */
     @GetMapping("/record/recordList")
-    public ResponseJson<PaginationVo<CmBehaviorRecord>> recordList (CmBehaviorRecord cmBehaviorRecord,
-                                                                    @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                    @RequestParam(value = "pageSize",defaultValue = "20")int pageSize) {
+    public ResponseJson<Map<String, Object>> recordList (CmBehaviorRecord cmBehaviorRecord,
+                                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                        @RequestParam(value = "pageSize",defaultValue = "20")int pageSize) {
         return recordService.recordList(cmBehaviorRecord, pageNum, pageSize);
     }
 

src/main/java/com/caimei365/manager/service/caimei/user/CmBehaviorRecordService.java

@@ -6,6 +6,7 @@ import com.caimei365.manager.entity.caimei.CmBehaviorRecord;
 import com.caimei365.manager.entity.caimei.CmPageType;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -50,7 +51,7 @@ public interface CmBehaviorRecordService {
      * @param pageSize
      * @return
      */
-    ResponseJson<PaginationVo<CmBehaviorRecord>> recordList(CmBehaviorRecord cmBehaviorRecord,Integer pageNum, Integer pageSize);
+    ResponseJson<Map<String, Object>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize);
 
     /**
      * 标签库数据

src/main/java/com/caimei365/manager/service/caimei/user/impl/CmBehaviorRecordServiceImpl.java

@@ -7,6 +7,7 @@ import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.caimei.CmBehaviorRecord;
 import com.caimei365.manager.entity.caimei.CmPageType;
+import com.caimei365.manager.entity.caimei.RetuenEntity;
 import com.caimei365.manager.service.caimei.user.CmBehaviorRecordService;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +19,7 @@ import java.net.URLDecoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Description
@@ -162,7 +164,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
      * @return
      */
     @Override
-    public ResponseJson<PaginationVo<CmBehaviorRecord>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize) {
+    public ResponseJson<Map<String, Object>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize) {
+        Map<String, Object> map = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
         // 详情
         List<CmBehaviorRecord> recordList = cmBehaviorRecordDao.recordList(cmBehaviorRecord);
@@ -170,6 +173,9 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
         List<CmBehaviorRecord> reginList = cmBehaviorRecordDao.selRegion(cmBehaviorRecord.getAccessDate());
         // 供应商信息
         List<CmBehaviorRecord> shopNameList = cmBehaviorRecordDao.behaviorShopNameList();
+        // 标签总结
+        List<RetuenEntity> label = new ArrayList<>();
+        AtomicReference<Integer> returnId = new AtomicReference<>(0);
         // 计算访问时长，填入信息
         recordList.forEach(r -> {
             r.setProductImage(AppUtils.getImageURL("product", r.getProductImage(), 0, ""));
@@ -216,9 +222,37 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                 }
                 r.setRelevanceShop(shopName);
             }
+            if ("6".equals(r.getPageType()) || "8".equals(r.getPageType()) || "9".equals(r.getPageType()) || "11".equals(r.getPageType())) {
+                if(StringUtils.isNotBlank(r.getPageLabel()) && StringUtils.isNotEmpty(r.getPageLabel()) && !label.contains(r.getPageLabel())) {
+                    RetuenEntity retuenEntity = new RetuenEntity();
+                    if (r.getPageLabel().contains(",")) {
+                        log.info("contains");
+                        String[] split = r.getPageLabel().split(",");
+                        for (String str : split) {
+                            if (StringUtils.isNotBlank(str) &&  !label.contains(str)) {
+                                retuenEntity = new RetuenEntity();
+                                returnId.updateAndGet(v -> v + 1);
+                                retuenEntity.setId(returnId.get().toString());
+                                retuenEntity.setValue(str);
+                                label.add(retuenEntity);
+                            }
+                        }
+                    } else {
+                        log.info("not   contains");
+                        if (!label.contains(r.getPageLabel())) {
+                            returnId.updateAndGet(v -> v + 1);
+                            retuenEntity.setId(returnId.get().toString());
+                            retuenEntity.setValue(r.getPageLabel());
+                            label.add(retuenEntity);
+                        }
+                    }
+                }
+            }
         });
         PaginationVo<CmBehaviorRecord> pageData = new PaginationVo<>(recordList);
-        return ResponseJson.success(pageData);
+        map.put("page", pageData);
+        map.put("label", label);
+        return ResponseJson.success(map);
     }
 
     /**

src/main/resources/mapper/CmBehaciorRecordDao.xml

@@ -63,11 +63,14 @@
         FROM cm_behavior_record_index
         <where>
             delFlag = 0
+            <if test="clubId != null">
+                AND clubId = #{clubId}
+            </if>
             <if test="ip != null and ip != ''">
                 AND IP = #{ip}
             </if>
             <if test="corporateName != null and corporateName != ''">
-                AND (corporateName like concat('%',#{corporateName},'%') or contacts like concat('%',#{corporateName},'%'))
+                AND (corporateName like concat('%',#{corporateName},'%') OR consultName  LIKE concat('%',#{corporateName},'%') or contacts like concat('%',#{corporateName},'%'))
             </if>
             <if test="companyType != null and companyType != ''">
                 AND companyType = #{companyType}
@@ -136,11 +139,14 @@
         addTime
         FROM cm_behavior_record_today
         <where>
+            <if test="clubId != null">
+                AND clubId = #{clubId}
+            </if>
             <if test="ip != null and ip != ''">
                 AND IP = #{ip}
             </if>
             <if test="corporateName != null and corporateName != ''">
-                AND (corporateName like concat('%',#{corporateName},'%') or contacts like concat('%',#{corporateName},'%'))
+                AND (corporateName like concat('%',#{corporateName},'%') OR consultName LIKE concat('%',#{corporateName},'%') or contacts like concat('%',#{corporateName},'%'))
             </if>
             <if test="companyType != null and companyType != ''">
                 AND companyType = #{companyType}

src/main/resources/mapper/user/CmClubRemarksDao.xml

@@ -91,6 +91,9 @@
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
             s.validFlag = 1 and s.serviceProviderID not in (1371, 1342)
+            <if test="clubId != null">
+                AND ccr.clubId = #{clubId}
+            </if>
             <if test="remarks != null and remarks !=''">
                 AND ccr.remarks LIKE concat('%',#{remarks},'%')
             </if>
@@ -152,6 +155,9 @@
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
+            <if test="clubId != null">
+                AND ccr.clubId = #{clubId}
+            </if>
             <if test="remarks != null and remarks !=''">
                 AND ccr.remarks LIKE concat('%',#{remarks},'%')
             </if>