Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/notify/NoticeMessageApiService.java

@@ -19,6 +19,12 @@ public interface NoticeMessageApiService {
     public void noticeMessageMq(String json);
 
     /**
+     * 冗余
+     * @param json
+     */
+    public void run(String json);
+
+    /**
      * 消息分页
      *1
      * @param enterpriseId

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/PendingTaskService.java

@@ -81,5 +81,12 @@ public interface PendingTaskService {
      */
     public boolean updateInvalidTimeByBusinessId(String businessId, Date time);
 
+    /**
+     * 完成
+     * @param relationId
+     * @return
+     */
+    public boolean updateFinish(String relationId);
+
 
 }

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

@@ -111,4 +111,17 @@ public class PendingTaskServiceImpl implements PendingTaskService {
         pendingTaskMapper.updateInvalidTimeByBusinessId(businessId, time);
         return true;
     }
+
+    @Override
+    public boolean updateFinish(String relationId) {
+        TabPendingTask pendingTask = pendingTaskMapper.getByRelationId(relationId);
+        if (null == pendingTask) {
+            return true;
+        }
+        pendingTask.setFinishFlag(1);
+        pendingTask.setFinishTime(new Date());
+        pendingTask.setUpdateTime(new Date());
+        pendingTaskMapper.updateByPrimaryKeySelective(pendingTask);
+        return true;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -139,6 +139,10 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
         sendMessage(contentList, wxEnterpriseId, wxUserId, messageTypeEnum, noticeMessageBO.getMessageContent());
     }
 
+    @Override
+    public void run(String json) {
+        this.noticeMessageMq(json);
+    }
 
     @Override
     public ServiceResponse<Page<NoticeMessageInfoDTO>> pageNoticeMessage(String enterpriseId, String storeId, String clerkId, int categoryType, BasePageInfo pageInfo) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/PendingTaskApiServiceImpl.java

@@ -128,10 +128,7 @@ public class PendingTaskApiServiceImpl implements PendingTaskApiService {
 
     @Override
     public ServiceResponse<Boolean> finishPending(String relationId) {
-        PendingTaskBO pendingTaskBO = new PendingTaskBO();
-        pendingTaskBO.setRelationId(relationId);
-        pendingTaskBO.setFinishFlag(1);
-        boolean b = pendingTaskService.addOrUpdatePendingTask(pendingTaskBO);
+        boolean b = pendingTaskService.updateFinish(relationId);
         return ServiceResponse.success(b);
     }
 

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

@@ -664,7 +664,7 @@ public class ClerkController extends WebBaseController {
     //精确查，根据手机号或者code，查找
     @RequestMapping("query-clerk-list-by-code")
     public HaobanResponse queryClerkListByCode(String keyword, String wxEnterpriseId, String staffId) {
-        if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
+        if (StringUtils.isAnyBlank(staffId, wxEnterpriseId,keyword)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);