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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/AdminWebsitApplyBean.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 public class AdminWebsitApplyBean extends WebsitVO {
 
-    @ApiModelProperty("网点状态 OK=已入驻 FAIL=驳回 WAIT=待审批 N=未申请入驻")
+    @ApiModelProperty("师傅入驻情况(WAIT=入驻待审核 WAIT_WORKER 待师傅购买  POLICY_WAIT 保险待审核  OK=通过 FAIL=驳回EXPIRED 证件快过期  OVERDUE 证件已过期 STOP 暂停 QUIT 已离职)")
     private String examineStatus;
     @ApiModelProperty("是否为默认网点")
     private Boolean isDefaultWebsit = false;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -234,11 +234,13 @@ public class UserController {
     public ResponseHelper<List<AdminWebsitApplyBean>> applyWebsitList(
             @ApiParam(value = "是否查询所有可入驻网点(包含未入驻的)",required = false) @RequestParam(required = false) Boolean isAll,
             @ApiParam(value = "是否为增置服务网点",required = false) @RequestParam(required = false) Boolean isIncre,
+            @ApiParam(value = "(WAIT=入驻待审核 WAIT_WORKER 待师傅购买  POLICY_WAIT 保险待审核  OK=通过 FAIL=驳回EXPIRED 证件快过期  OVERDUE 证件已过期 STOP 暂停 QUIT 已离职)",required = false)
+            @RequestParam(required = false) List<String> examineStatus,
             @ApiParam(value = "增值服务ID",required = false) @RequestParam(required = false) String increId,
             @ApiParam(value = "经度",required = false) @RequestParam(required = false) String lng,
             @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat
     ){
-        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(isAll,increId,isIncre,lng,lat);
+        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(isAll,increId,isIncre,lng,lat,examineStatus);
         return ResponseHelper.success(adminWebsitApplyBeans);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1154,7 +1154,7 @@ public class UserLogic {
      *
      * @return
      */
-    public List<AdminWebsitApplyBean> websitList(Boolean isAll, String increId, Boolean isIncre, String lng, String lat) {
+    public List<AdminWebsitApplyBean> websitList(Boolean isAll, String increId, Boolean isIncre, String lng, String lat,List<String> examineStatus) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 //        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
 //                .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
@@ -1167,6 +1167,7 @@ public class UserLogic {
 
         List<WebsitUser> websitUserList = websitUserService.lambdaQuery()
                 .eq(WebsitUser::getUserId, currentCompanyWechat.getUserId())
+                .in(!CollectionUtils.isEmpty(examineStatus),WebsitUser::getExamineStatus, examineStatus)
                 .list();
 
         Map<String, WebsitUser> websitUserMap = websitUserList.stream().collect(Collectors.toMap(v -> v.getWebsitId(), Function.identity()));

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -376,4 +376,14 @@ public class OrderBaseController {
         return ResponseHelper.success();
     }
 
+
+    @PostMapping("/dow")
+    @ApiOperation(value = "4.0总部下载")
+    public ResponseHelper dow(@ApiParam(value = "工单号id", required = true) @RequestParam String orderBaseId
+    ){
+        orderBaseLogic.dow(orderBaseId);
+        return ResponseHelper.success();
+    }
+
+
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -61,6 +61,7 @@ public class WorkerManagerLogic {
     SysDictCompanyService sysDictCompanyService;
 
 
+
     public void stop(String id) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1676,4 +1677,19 @@ public class OrderBaseLogic {
     public void update(PgOrderBase pgOrderBase) {
         pgOrderBase.updateById();
     }
+
+    public void dow(String orderBaseId) {
+        PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
+
+
+
+        ItfGreeSynDownloadRec itfGreeSynDownloadRec = new ItfGreeSynDownloadRec();
+        itfGreeSynDownloadRec.setSynReqTime(new Date());
+        itfGreeSynDownloadRec.setGreeStatSynStatus(0);
+        itfGreeSynDownloadRec.setSalesWebsitNumber(pgOrderBase.getSalesWebsitNumber());
+
+        itfGreeSynDownloadRec.setWorkOrderId(pgOrderBase.getId());
+        itfGreeSynDownloadRec.setUpdatedTimestamp(new Date());
+        itfGreeSynDownloadRec.insert();
+    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/schedule/SyncSchedule.java

@@ -41,7 +41,7 @@ public class SyncSchedule {
 
 
     //同步工单数据
-   // @Scheduled(fixedDelay = 5* 1000)
+    @Scheduled(fixedDelay = 5* 1000)
     public void task3() throws IOException, MessagingException {
         syncOrderInfoLogic.task3();
     }