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

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -228,7 +228,7 @@ public class HmLinkController {
         return null;
     }
 
-    private static String otherStoreRuleLog(JSONObject oldStoreRuleObj, JSONObject newStoreRuleObj) {
+    private String otherStoreRuleLog(JSONObject oldStoreRuleObj, JSONObject newStoreRuleObj) {
         StringBuilder tempSb = new StringBuilder();
         int oldOpenFlag = oldStoreRuleObj.getIntValue("open");
         int newOpenFlag = newStoreRuleObj.getIntValue("open");
@@ -253,18 +253,18 @@ public class HmLinkController {
                 tempSb.append(cityLog);
             } else {
                 if (newStoreType == 1) {
-                    tempSb.append(ruleLogOther(oldtore, newStore, 5));
+                    tempSb.append(otherChangeLog(oldtore, newStore, 5));
                 } else if (newStoreType == 2) {
-                    tempSb.append(ruleLogOther(oldtore, newStore, 6));
+                    tempSb.append(otherChangeLog(oldtore, newStore, 6));
                 }
-                tempSb.append(ruleLogOther(oldCityStore, newCityStore, 4));
+                tempSb.append(ruleLog(oldCityStore, newCityStore, 4));
             }
-
         }
         return tempSb.toString();
     }
 
-    private static String otherOpenLog(HmLinkStoreSettingDTO newStore, int level) {
+    // 其他门店-开启的日志
+    private String otherOpenLog(HmLinkStoreSettingDTO newStore, int level) {
         StringBuilder tempSb = new StringBuilder();
         String title = "";
         if (level == 4) {
@@ -292,7 +292,8 @@ public class HmLinkController {
 
     }
 
-    private static String ruleLogOther(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, int level) {
+    // 其他门店-变更的日志
+    private String otherChangeLog(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, int level) {
         StringBuilder tempSb = new StringBuilder();
         String title = "";
         if (level == 5) {
@@ -325,10 +326,16 @@ public class HmLinkController {
         }
         tempSb.append(tempSb);
         return tempSb.toString();
-
     }
 
-    private static String ruleLog(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, int level) {
+    // 服务门店、协管门店 、省市筛选
+    private String ruleLog(HmLinkStoreSettingDTO oldStore, HmLinkStoreSettingDTO newStore, int level) {
+        if (null == oldStore) {
+            oldStore = new HmLinkStoreSettingDTO();
+        }
+        if (null == newStore) {
+            newStore = new HmLinkStoreSettingDTO();
+        }
         StringBuilder tempSb = new StringBuilder();
         int oldOpenFlag = oldStore.getOpen();
         int newOpenFlag = newStore.getOpen();
@@ -383,7 +390,8 @@ public class HmLinkController {
         return tempSb.toString();
     }
 
-    private static String getLogOption(int zs, int xg, int dz, int dy, int ndz, int ndy, int level) {
+    // 拼接选项名称
+    private String getLogOption(int zs, int xg, int dz, int dy, int ndz, int ndy, int level) {
         List<String> list = new ArrayList<>();
         if (zs == 1) {
             list.add("专属导购");
@@ -409,7 +417,6 @@ public class HmLinkController {
                     list.add("导购");
                 }
             }
-
         }
         String s2 = "(拒绝授权)";
         if (ndz == 1) {
@@ -432,13 +439,13 @@ public class HmLinkController {
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         ServiceResponse<Page<HmLinkDTO>> resp = this.hmLinkApiService.listPage(qdto, basePageInfo);
         Page<HmLinkDTO> page = resp.getResult();
-        Page<HmLinkListVO> retPage = EntityUtil.changeEntityByJSON(Page.class, page);
+        Page<HmLinkListVO> retPage = PageHelperUtils.changePageHelperToCurrentPage(page.getResult(),
+                HmLinkListVO.class);
         List<HmLinkListVO> list = EntityUtil.changeEntityListByJSON(HmLinkListVO.class, page.getResult());
         ServiceResponse<String> urlResp = this.hmLinkApiService.getHmLinkUrl();
         list.forEach(item -> {
             item.setLinkUrl(urlResp.getResult() + item.getShortCode());
         });
-        retPage.setResult(list);
         return RestResponse.successResult(retPage);
     }
 
@@ -488,6 +495,7 @@ public class HmLinkController {
         return RestResponse.successResult(vo);
     }
 
+    // 统计图表
     @RequestMapping("statistics/chart")
     public RestResponse<Object> statisticsChart(Long linkId, Date startTime, Date endTime) {
         HmLinkStatisticsVO vo = new HmLinkStatisticsVO();
@@ -496,6 +504,7 @@ public class HmLinkController {
         return RestResponse.successResult(list);
     }
 
+    // 导购统计
     @RequestMapping("statistics/clerk")
     public RestResponse<Object> statisticsClerk(Long linkId, String storeSearchParams, String clerkSearchParams,
             Date startTime, Date endTime, BasePageInfo basePageInfo) {
@@ -506,6 +515,7 @@ public class HmLinkController {
         return RestResponse.successResult(page);
     }
 
+    // 加好友列表
     @RequestMapping("statistics/log")
     public RestResponse<Object> statisticsDetail(Long linkId, String clerkId, Date startTime, Date endTime,
             BasePageInfo basePageInfo) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/hm/HmLinkStatisticsVO.java

@@ -18,7 +18,7 @@ public class HmLinkStatisticsVO implements Serializable {
     // 点击总人次
     private Integer clickTimesT;
     // X轴
-    private String bizDate ;
+    private String bizDate;
 
     public String getBizDate() {
         return bizDate;