Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/feign/bean/Photo.java → project-interface/src/main/java/com/dituhui/pea/bean/Photo.java

-package com.dituhui.pea.order.feign.bean;
+package com.dituhui.pea.bean;
 
 import lombok.Getter;
 import lombok.Setter;

project-order/src/main/java/com/dituhui/pea/order/feign/bean/Reason.java → project-interface/src/main/java/com/dituhui/pea/bean/Reason.java

-package com.dituhui.pea.order.feign.bean;
+package com.dituhui.pea.bean;
 
 import lombok.Getter;
 import lombok.Setter;

project-interface/src/main/java/com/dituhui/pea/bean/RemoteBeanApi.java

@@ -22,4 +22,13 @@ public interface RemoteBeanApi {
      */
     @PostMapping("/task/updateAllotResult")
     boolean allotResultUpdate(@Valid @RequestBody AllotResultParam allotResultParam);
+
+    /**
+     * 服务单改约 通知BEAN
+     *
+     * @param rescheduled 更新参数
+     * @return 是否回调BEAN成功
+     */
+    @PostMapping("/task/orderRescheduled")
+    boolean orderRescheduled(@Valid @RequestBody Rescheduled rescheduled);
 }

project-order/src/main/java/com/dituhui/pea/order/feign/bean/Rescheduled.java → project-interface/src/main/java/com/dituhui/pea/bean/Rescheduled.java

-package com.dituhui.pea.order.feign.bean;
+package com.dituhui.pea.bean;
 
 import lombok.Getter;
 import lombok.Setter;

project-order/src/main/java/com/dituhui/pea/order/constant/OrderReschedulingReason.java

 package com.dituhui.pea.order.constant;
 
 import com.alibaba.fastjson.JSONObject;
-import com.dituhui.pea.order.feign.bean.Reason;
+import com.dituhui.pea.bean.Reason;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;

project-order/src/main/java/com/dituhui/pea/order/feign/BeanRemoteServiceInner.java

@@ -2,6 +2,7 @@ package com.dituhui.pea.order.feign;
 
 import com.dituhui.pea.bean.AllotResultParam;
 import com.dituhui.pea.bean.RemoteBeanApi;
+import com.dituhui.pea.bean.Rescheduled;
 import com.dituhui.pea.order.service.impl.BeanRemoteServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,4 +18,9 @@ public class BeanRemoteServiceInner implements RemoteBeanApi {
     public boolean allotResultUpdate(AllotResultParam allotResultParam) {
         return beanRemoteService.allotResultUpdate(allotResultParam);
     }
+
+    @Override
+    public boolean orderRescheduled(Rescheduled rescheduled) {
+        return beanRemoteService.orderRescheduled(rescheduled);
+    }
 }

project-order/src/main/java/com/dituhui/pea/order/feign/IBeanRemoteService.java

 package com.dituhui.pea.order.feign;
 
 import com.dituhui.pea.bean.AllotResultParam;
+import com.dituhui.pea.bean.Rescheduled;
 import com.dituhui.pea.order.feign.bean.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

project-order/src/main/java/com/dituhui/pea/order/feign/bean/OrderCancel.java

 package com.dituhui.pea.order.feign.bean;
 
+import com.dituhui.pea.bean.Photo;
+import com.dituhui.pea.bean.Reason;
 import lombok.Getter;
 import lombok.Setter;
 

project-order/src/main/java/com/dituhui/pea/order/service/impl/BeanRemoteServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.util.ObjUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.dituhui.pea.bean.AllotResultParam;
+import com.dituhui.pea.bean.Reason;
+import com.dituhui.pea.bean.Rescheduled;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.enums.StatusCodeEnum;

project-order/src/main/java/com/dituhui/pea/order/service/impl/MsgServiceImpl.java

@@ -153,8 +153,8 @@ public class MsgServiceImpl implements MsgService {
         }
 
         List<String> userList = msgDao.getDispatchUserList(dto.getClusterId(), dto.getBranchId(), dto.getGroupId());
-        if (!userList.contains("1")) {
-            userList.add("1");
+        if (!userList.contains("c8d384973ee543d3aa6f5b355e184ccc")) {
+            userList.add("c8d384973ee543d3aa6f5b355e184ccc");
         }
 
         MsgEntity msgEntity = new MsgEntity();

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java

@@ -23,9 +23,7 @@ import com.dituhui.pea.order.dto.param.OrderDTO;
 import com.dituhui.pea.order.dto.param.OrgTeamInfo;
 import com.dituhui.pea.order.entity.*;
 import com.dituhui.pea.order.enums.*;
-import com.dituhui.pea.order.feign.bean.OrderCancel;
-import com.dituhui.pea.order.feign.bean.Reason;
-import com.dituhui.pea.order.feign.bean.Rescheduled;
+import com.dituhui.pea.bean.Rescheduled;
 import com.dituhui.pea.order.service.*;
 import com.dituhui.pea.order.utils.CommonUtil;
 import com.dituhui.pea.order.utils.OrderUtil;

project-order/src/main/java/com/dituhui/pea/order/service/impl/PeaOuterAPIServiceImpl.java

@@ -29,8 +29,8 @@ import com.dituhui.pea.order.enums.OrderEventEnum;
 import com.dituhui.pea.order.enums.OrderFlowEnum;
 import com.dituhui.pea.order.enums.OrderStatusEnum;
 import com.dituhui.pea.order.enums.ServiceStatusEnum;
-import com.dituhui.pea.order.feign.bean.Reason;
-import com.dituhui.pea.order.feign.bean.Rescheduled;
+import com.dituhui.pea.bean.Reason;
+import com.dituhui.pea.bean.Rescheduled;
 import com.dituhui.pea.order.service.CommonService;
 import com.dituhui.pea.order.service.PeaOuterAPIService;
 import com.dituhui.pea.order.utils.CommonUtil;