Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/notify/qdto/PendingListQDTO.java

@@ -24,11 +24,11 @@ public class PendingListQDTO implements Serializable {
     /**
      * 是否完成 0否 1是
      */
-    private Integer finishFlag;
+    private Integer finishFlag = -1;
     /**
      * 是否逾期 1是 0否
      */
-    private Integer overdueFlag;
+    private Integer overdueFlag = -1;
 
     /**
      * 门店id

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

@@ -6,8 +6,8 @@ package com.gic.haoban.manage.api.enums;
 public enum PendingTaskTypeEnum {
     PERFORMANCE(0, "月指标", "请完善{}月份指标"),
     TEL_TASK(1, "话务任务", "您收到了新的话务任务【{}】，赶紧去执行吧~"),
-    GROUP_TASK(2, "群发任务", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-客户联系中执行吧~"),
-    ACTIVITY(3, "活动", "您报名的{}活动已经开始啦，快去转发赚佣金吧~"),;
+    GROUP_TASK(3, "群发任务", "您收到了新的企微群发任务【{}】，赶紧到企业微信-消息-客户联系中执行吧~"),
+    ACTIVITY(4, "活动", "您报名的{}活动已经开始啦，快去转发赚佣金吧~"),;
     private int type;
     private String name;
     private String description;

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

@@ -251,7 +251,7 @@
         <if test="overdueFlag != -1">
             and overdue_flag = #{overdue_flag}
         </if>
-        <if test="clerkId != -1">
+        <if test="clerkId != null">
             and clerk_id = #{clerkId}
         </if>
         order by overdue_time desc

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/NotifyController.java

@@ -45,6 +45,11 @@ public class NotifyController extends WebBaseController {
     @RequestMapping("/commission/list")
     public HaobanResponse pendingList(@RequestBody @Valid PendingListQO qo) {
         PendingListQDTO pendingListQDTO = EntityUtil.changeEntityByOrika(PendingListQDTO.class, qo);
+        pendingListQDTO.setFinishFlag(0);
+        pendingListQDTO.setOverdueFlag(-1);
+        if (qo.getFilterStatus() == 1) {
+            pendingListQDTO.setOverdueFlag(1);
+        }
         ServiceResponse<Page<PendingTaskDetailDTO>> retPage = pendingTaskApiService.pagePendingTask(pendingListQDTO, qo.getBasePageInfo());
         return resultResponse(HaoBanErrCode.ERR_1, retPage.getResult());
     }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -397,10 +397,10 @@ public class WxEnterpriseInfoController extends WebBaseController {
             logger.info("企业不存在没有绑定");
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
-        if (enterpriseBindInfo.getMemberOpenCardFlag() != 1) {
-            logger.info("该企业在同一个开平，无需手动关联:wxEid:{}, eid:{}", wxEnterpriseId, gicEnterpriseId);
-            return resultResponse(HaoBanErrCode.ERR_11125);
-        }
+        //if (enterpriseBindInfo.getMemberOpenCardFlag() != 1) {
+        //    logger.info("该企业在同一个开平，无需手动关联:wxEid:{}, eid:{}", wxEnterpriseId, gicEnterpriseId);
+        //    return resultResponse(HaoBanErrCode.ERR_11125);
+        //}
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid);
         if (null == memberUnionidRelatedDTO) {
             logger.info("请刷新好友");