Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 67359cd6
authored
Dec 07, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:interface增加改约接口
1 parent
0fae55bf
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
27 additions
and
9 deletions
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Photo.java → project-interface/src/main/java/com/dituhui/pea/bean/Photo.java
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Reason.java → project-interface/src/main/java/com/dituhui/pea/bean/Reason.java
project-interface/src/main/java/com/dituhui/pea/bean/RemoteBeanApi.java
project-order/src/main/java/com/dituhui/pea/order/feign/bean/Rescheduled.java → project-interface/src/main/java/com/dituhui/pea/bean/Rescheduled.java
project-order/src/main/java/com/dituhui/pea/order/constant/OrderReschedulingReason.java
project-order/src/main/java/com/dituhui/pea/order/feign/BeanRemoteServiceInner.java
project-order/src/main/java/com/dituhui/pea/order/feign/IBeanRemoteService.java
project-order/src/main/java/com/dituhui/pea/order/feign/bean/OrderCancel.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BeanRemoteServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderInfoServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/PeaOuterAPIServiceImpl.java
project-
order/src/main/java/com/dituhui/pea/order/feign
/bean/Photo.java
→
project-
interface/src/main/java/com/dituhui/pea
/bean/Photo.java
View file @
67359cd
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
View file @
67359cd
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
View file @
67359cd
...
...
@@ -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
View file @
67359cd
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
View file @
67359cd
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
View file @
67359cd
...
...
@@ -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
View file @
67359cd
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
View file @
67359cd
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
View file @
67359cd
...
...
@@ -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/OrderInfoServiceImpl.java
View file @
67359cd
...
...
@@ -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
View file @
67359cd
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment