Merge branch 'feature/xgh/2406企微托管' into 'developer'

企微托管

See merge request !1926

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/OpenStaffOfflineEnum.java

@@ -2,7 +2,7 @@ package com.gic.haoban.manage.api.enums;
 
 public enum OpenStaffOfflineEnum {
 
-    OFFLINE1(1, "首次托管,需要二次验证"),
+    OFFLINE1(1, "首次托管，需要二次验证"),
     OFFLINE2(2, "异常断开"),
     OFFLINE3(3, "手机端结束登录"),
     OFFLINE4(4, "当前账号在其它设备登录");

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/OpenStaffServiceImpl.java

@@ -96,7 +96,7 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         openStaff.setQrCode2(null);
         openStaff.setKey1(null);
         openStaff.setKey2(null);
-        openStaff.setUuid(null);
+        openStaff.setUuid(uuid);
         openStaff.setLoginRemark(loginRemark);
         this.openStaffMapper.update(openStaff);
 

haoban-manage3-service/src/main/resources/mapper/OpenStaffMapper.xml

@@ -84,14 +84,14 @@
     <update id="update2QrcodeFlag">
         update tab_haoban_open_staff
         set valid_qrcode_flag = 1
-        where id = #{id}
+        where open_staff_id = #{id}
     </update>
 
     <update id="update2Qrcode">
         update tab_haoban_open_staff
         set qr_code_2 = #{qrCode},
             key_2     = #{key}
-        where id = #{id}
+        where open_staff_id = #{id}
     </update>
 
     <update id="updateLoginStep">

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/OpenAddMemberExcelHandler.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.web.vo.open.AddMemberExcelVO;
 import com.gic.haoban.task.manage.api.dto.open.OpenQwAddTaskMemberDTO;
@@ -37,6 +38,17 @@ public class OpenAddMemberExcelHandler extends DownloadHandlerAbstract<AddMember
         if (null != page && CollectionUtils.isNotEmpty(page.getResult().getResult())) {
             for (OpenQwAddTaskMemberDTO item : page.getResult().getResult()) {
                 AddMemberExcelVO vo = EntityUtil.changeEntityByJSON(AddMemberExcelVO.class, item);
+                if (item.getStatusFlag() == 1) {
+                    vo.setStatusExcel("待通过");
+                } else {
+                    vo.setStatusExcel("已添加");
+                }
+                if (null != item.getApplyTime()) {
+                    vo.setApplyTimeExcel(DateUtil.dateToStr(item.getApplyTime(), "yyyy-MM-dd HH:mm:ss"));
+                }
+                if (null != item.getAddTime()) {
+                    vo.setAddTimeExcel(DateUtil.dateToStr(item.getAddTime(), "yyyy-MM-dd HH:mm:ss"));
+                }
                 voList.add(vo);
             }
         }
@@ -45,7 +57,7 @@ public class OpenAddMemberExcelHandler extends DownloadHandlerAbstract<AddMember
 
     @Override
     public List<String> getColumnNames() {
-        return Arrays.asList("成员姓名", "导购姓名", "导购code", "导购所属门店名称", "导购所属门店code", "会话类型", "客户姓名", "客户昵称", "客户手机号", "状态", "添加好友时间", "申请添加时间");
+        return Arrays.asList("成员姓名", "导购姓名", "导购code", "导购所属门店名称", "导购所属门店code", "客户姓名", "客户昵称", "客户手机号", "状态", "添加好友时间", "申请添加时间");
     }
 
     @Override
@@ -55,7 +67,7 @@ public class OpenAddMemberExcelHandler extends DownloadHandlerAbstract<AddMember
 
     @Override
     public List<String> getColumns() {
-        return Arrays.asList("staffName", "clerkName", "clerkCode", "storeName", "storeCode", "chatTypeExcel", "memberName", "memberNick", "memberPhone", "statusExcel", "addTimeExcel", "applyTimeExcel");
+        return Arrays.asList("staffName", "clerkName", "clerkCode", "storeName", "storeCode", "memberName", "memberNick", "memberPhone", "statusExcel", "addTimeExcel", "applyTimeExcel");
     }
 
     @Override

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/OpenAlarmWordsLogExcelHandler.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.web.vo.open.OpenQwAlarmLogExcelVO;
 import com.gic.haoban.task.manage.api.dto.open.OpenQwAlarmLogDTO;
@@ -24,23 +25,26 @@ import java.util.List;
 public class OpenAlarmWordsLogExcelHandler extends DownloadHandlerAbstract<OpenQwAlarmLogExcelVO> {
 
     @Autowired
-    private OpenQwApiService openQwApiService ;
+    private OpenQwApiService openQwApiService;
 
     @Override
     public List<OpenQwAlarmLogExcelVO> getData(Context context, String json, Integer currentPage) {
         AlarmWordsLogQDTO qdto = JSON.parseObject(json, AlarmWordsLogQDTO.class);
-        BasePageInfo pageInfo = new BasePageInfo() ;
+        BasePageInfo pageInfo = new BasePageInfo();
         pageInfo.setPageSize(this.getPageSize());
         pageInfo.setPageNum(currentPage);
         ServiceResponse<Page<OpenQwAlarmLogDTO>> page = this.openQwApiService.alarmWordsLogPage(qdto, pageInfo);
         List<OpenQwAlarmLogExcelVO> voList = new ArrayList<>();
         if (null != page && CollectionUtils.isNotEmpty(page.getResult().getResult())) {
-            for(OpenQwAlarmLogDTO item : page.getResult().getResult()) {
-                OpenQwAlarmLogExcelVO vo = EntityUtil.changeEntityByJSON(OpenQwAlarmLogExcelVO.class,item) ;
-                if(item.getChatType()==1) {
-                }else {
+            for (OpenQwAlarmLogDTO item : page.getResult().getResult()) {
+                OpenQwAlarmLogExcelVO vo = EntityUtil.changeEntityByJSON(OpenQwAlarmLogExcelVO.class, item);
+                if (item.getChatType() == 1) {
+                    vo.setChatTypeExcel("单聊");
+                } else {
+                    vo.setChatTypeExcel("群聊");
                 }
-                voList.add(vo) ;
+                vo.setCreateTimeExcel(DateUtil.dateToStr(item.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                voList.add(vo);
             }
         }
         return voList;
@@ -48,7 +52,7 @@ public class OpenAlarmWordsLogExcelHandler extends DownloadHandlerAbstract<OpenQ
 
     @Override
     public List<String> getColumnNames() {
-        return Arrays.asList("成员姓名", "导购姓名","导购code","导购所属门店名称","导购所属门店code","会话类型","客户姓名","客户昵称","客户手机号","群名称","敏感词","会话内容","会话时间");
+        return Arrays.asList("成员姓名", "导购姓名", "导购code", "导购所属门店名称", "导购所属门店code", "会话类型", "客户姓名", "客户昵称", "客户手机号", "群名称", "敏感词", "会话内容", "会话时间");
     }
 
     @Override
@@ -58,11 +62,11 @@ public class OpenAlarmWordsLogExcelHandler extends DownloadHandlerAbstract<OpenQ
 
     @Override
     public List<String> getColumns() {
-        return Arrays.asList("staffName", "clerkName", "clerkCode", "storeName","storeCode", "chatTypeExcel","memberName","memberNick","memberPhone","groupChatName","alarmWords","content","createTimeExcel");
+        return Arrays.asList("staffName", "clerkName", "clerkCode", "storeName", "storeCode", "chatTypeExcel", "memberName", "memberNick", "memberPhone", "groupChatName", "alarmWords", "content", "createTimeExcel");
     }
 
     @Override
     public Integer getPageSize() {
-        return 1000 ;
+        return 1000;
     }
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -269,6 +269,9 @@ public class QywxOpenTaskController {
         basePageInfo.setPageNum(qo.getPageNum());
         basePageInfo.setPageSize(qo.getPageSize());
         AddTaskMemberPageQDTO qdto = EntityUtil.changeEntityByJSON(AddTaskMemberPageQDTO.class, qo);
+        if (null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         ServiceResponse<Page<OpenQwAddTaskMemberDTO>> resp = this.openQwApiService.addFriendPage(qdto, basePageInfo);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/open/AddMemberExcelVO.java

@@ -8,11 +8,11 @@ public class AddMemberExcelVO implements Serializable {
     /**
      * 申请时间
      */
-    private java.util.Date applyTimeExcel;
+    private String applyTimeExcel;
     /**
      * 加成功时间
      */
-    private java.util.Date addTimeExcel;
+    private String addTimeExcel;
     /**
      * 会员Nick
      */
@@ -49,19 +49,19 @@ public class AddMemberExcelVO implements Serializable {
 
     private String statusExcel;
 
-    public Date getApplyTimeExcel() {
+    public String getApplyTimeExcel() {
         return applyTimeExcel;
     }
 
-    public void setApplyTimeExcel(Date applyTimeExcel) {
+    public void setApplyTimeExcel(String applyTimeExcel) {
         this.applyTimeExcel = applyTimeExcel;
     }
 
-    public Date getAddTimeExcel() {
+    public String getAddTimeExcel() {
         return addTimeExcel;
     }
 
-    public void setAddTimeExcel(Date addTimeExcel) {
+    public void setAddTimeExcel(String addTimeExcel) {
         this.addTimeExcel = addTimeExcel;
     }