Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
oms-ci-test
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
test-ci
oms-ci-test
Commits
21f7da30
提交
21f7da30
authored
9月 08, 2023
作者:
zhenjie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
商城订单关闭接口
上级
0aa416f0
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
98 行增加
和
4 行删除
+98
-4
UavOrderController.java
...n/java/com/mmc/oms/controller/uav/UavOrderController.java
+2
-2
PaymentAppApi.java
src/main/java/com/mmc/oms/feign/PaymentAppApi.java
+19
-0
PaymentAppApiHystrix.java
.../java/com/mmc/oms/feign/hystrix/PaymentAppApiHystrix.java
+21
-0
ApplyRefundVO.java
src/main/java/com/mmc/oms/model/vo/ApplyRefundVO.java
+26
-0
UavOrderService.java
src/main/java/com/mmc/oms/service/uav/UavOrderService.java
+1
-1
UavOrderServiceImpl.java
...ava/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java
+29
-1
没有找到文件。
src/main/java/com/mmc/oms/controller/uav/UavOrderController.java
浏览文件 @
21f7da30
...
@@ -47,8 +47,8 @@ public class UavOrderController extends BaseController {
...
@@ -47,8 +47,8 @@ public class UavOrderController extends BaseController {
@ApiOperation
(
value
=
"关闭"
)
@ApiOperation
(
value
=
"关闭"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
ResultBody
.
class
)})
@GetMapping
(
"close"
)
@GetMapping
(
"close"
)
public
ResultBody
close
(
@RequestParam
Integer
id
)
{
public
ResultBody
close
(
@RequestParam
Integer
id
,
HttpServletRequest
request
)
{
return
uavOrderService
.
close
(
id
);
return
uavOrderService
.
close
(
id
,
this
.
getCurrentAccount
(
request
).
getToken
()
);
}
}
@ApiOperation
(
value
=
"后台订单列表"
)
@ApiOperation
(
value
=
"后台订单列表"
)
...
...
src/main/java/com/mmc/oms/feign/PaymentAppApi.java
0 → 100644
浏览文件 @
21f7da30
package
com
.
mmc
.
oms
.
feign
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.hystrix.PaymentAppApiHystrix
;
import
com.mmc.oms.model.vo.ApplyRefundVO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
/**
* @author: zj
* @Date: 2023/9/8 11:08
*/
@FeignClient
(
url
=
"${payment.url}"
,
name
=
"payment-svc"
,
fallback
=
PaymentAppApiHystrix
.
class
)
public
interface
PaymentAppApi
{
@PostMapping
(
"wechat/applyRefund"
)
public
ResultBody
applyRefund
(
@RequestBody
ApplyRefundVO
applyRefundVO
);
}
src/main/java/com/mmc/oms/feign/hystrix/PaymentAppApiHystrix.java
0 → 100644
浏览文件 @
21f7da30
package
com
.
mmc
.
oms
.
feign
.
hystrix
;
import
com.alibaba.fastjson2.JSONObject
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.PaymentAppApi
;
import
com.mmc.oms.model.vo.ApplyRefundVO
;
import
lombok.extern.slf4j.Slf4j
;
/**
* @author: zj
* @Date: 2023/9/8 11:08
*/
@Slf4j
public
class
PaymentAppApiHystrix
implements
PaymentAppApi
{
@Override
public
ResultBody
applyRefund
(
ApplyRefundVO
applyRefundVO
)
{
log
.
error
(
"PaymentAppApiHystrix applyRefund ---- param:{}"
,
JSONObject
.
toJSONString
(
applyRefundVO
));
return
ResultBody
.
error
(
"调用微信退款失败"
);
}
}
\ No newline at end of file
src/main/java/com/mmc/oms/model/vo/ApplyRefundVO.java
0 → 100644
浏览文件 @
21f7da30
package
com
.
mmc
.
oms
.
model
.
vo
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* @Author LW
* @date 2023/7/22 14:51
* 概要:
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
ApplyRefundVO
{
@ApiModelProperty
(
value
=
"商户订单号"
,
required
=
true
)
private
String
outTradeNo
;
@ApiModelProperty
(
value
=
"退款原因"
)
private
String
reason
;
@ApiModelProperty
(
value
=
"退款金额"
,
required
=
true
)
private
Long
refund
;
// @ApiModelProperty(value = "商品信息(可填可不填)")
// private List<GoodsDetail> goodsDetail;
}
src/main/java/com/mmc/oms/service/uav/UavOrderService.java
浏览文件 @
21f7da30
...
@@ -20,7 +20,7 @@ public interface UavOrderService {
...
@@ -20,7 +20,7 @@ public interface UavOrderService {
ResultBody
detail
(
Integer
id
)
throws
Exception
;
ResultBody
detail
(
Integer
id
)
throws
Exception
;
ResultBody
close
(
Integer
id
);
ResultBody
close
(
Integer
id
,
String
token
);
ResultBody
list
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
ResultBody
list
(
UavOrderQO
uavOrderQO
,
BaseAccountDTO
currentAccount
);
...
...
src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java
浏览文件 @
21f7da30
...
@@ -13,12 +13,14 @@ import com.mmc.oms.dao.uav.UavOrderExpressDao;
...
@@ -13,12 +13,14 @@ import com.mmc.oms.dao.uav.UavOrderExpressDao;
import
com.mmc.oms.entity.mall.UserAddressDO
;
import
com.mmc.oms.entity.mall.UserAddressDO
;
import
com.mmc.oms.entity.uav.*
;
import
com.mmc.oms.entity.uav.*
;
import
com.mmc.oms.enums.UavOrderStatus
;
import
com.mmc.oms.enums.UavOrderStatus
;
import
com.mmc.oms.feign.PaymentAppApi
;
import
com.mmc.oms.feign.UserAppApi
;
import
com.mmc.oms.feign.UserAppApi
;
import
com.mmc.oms.model.dto.kdn.KdnExpDTO
;
import
com.mmc.oms.model.dto.kdn.KdnExpDTO
;
import
com.mmc.oms.model.dto.order.ExpStationsDTO
;
import
com.mmc.oms.model.dto.order.ExpStationsDTO
;
import
com.mmc.oms.model.dto.uav.*
;
import
com.mmc.oms.model.dto.uav.*
;
import
com.mmc.oms.model.dto.user.BaseAccountDTO
;
import
com.mmc.oms.model.dto.user.BaseAccountDTO
;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
com.mmc.oms.model.vo.ApplyRefundVO
;
import
com.mmc.oms.model.vo.demand.CommonPaymentVO
;
import
com.mmc.oms.model.vo.demand.CommonPaymentVO
;
import
com.mmc.oms.model.vo.uav.*
;
import
com.mmc.oms.model.vo.uav.*
;
import
com.mmc.oms.model.vo.wallet.TopUpOrderVO
;
import
com.mmc.oms.model.vo.wallet.TopUpOrderVO
;
...
@@ -59,6 +61,9 @@ public class UavOrderServiceImpl implements UavOrderService {
...
@@ -59,6 +61,9 @@ public class UavOrderServiceImpl implements UavOrderService {
@Autowired
@Autowired
private
PmsClient
pmsClient
;
private
PmsClient
pmsClient
;
@Autowired
private
PaymentAppApi
paymentAppApi
;
@Override
@Override
@Transactional
@Transactional
public
ResultBody
addOrder
(
AddUavOrderVO
param
,
BaseAccountDTO
currentAccount
)
{
public
ResultBody
addOrder
(
AddUavOrderVO
param
,
BaseAccountDTO
currentAccount
)
{
...
@@ -231,10 +236,32 @@ public class UavOrderServiceImpl implements UavOrderService {
...
@@ -231,10 +236,32 @@ public class UavOrderServiceImpl implements UavOrderService {
return
kdn
;
return
kdn
;
}
}
@Transactional
@Override
@Override
public
ResultBody
close
(
Integer
id
)
{
public
ResultBody
close
(
Integer
id
,
String
token
)
{
UavOrderDO
uavOrderDO
=
uavOrderDao
.
detail
(
id
);
// TODO 退款、修改订单状态
// TODO 退款、修改订单状态
this
.
updateUavOrderStatus
(
id
,
UavOrderStatus
.
CLOSE
);
this
.
updateUavOrderStatus
(
id
,
UavOrderStatus
.
CLOSE
);
// 云享金、佣金
PayUavWalletVO
payUavWalletVO
=
new
PayUavWalletVO
();
payUavWalletVO
.
setCashAmount
(
uavOrderDO
.
getShareAmount
());
payUavWalletVO
.
setSalaryAmount
(
uavOrderDO
.
getSalaryAmount
());
payUavWalletVO
.
setOrderStatus
(
1400
);
payUavWalletVO
.
setUserAccountId
(
uavOrderDO
.
getUserAccountId
());
ResultBody
resultBody
=
userAppApi
.
feignPayUavWallet
(
payUavWalletVO
,
token
);
if
(!
resultBody
.
getCode
().
equals
(
ResultEnum
.
SUCCESS
.
getResultCode
())){
return
resultBody
;
}
// 微信退款
ApplyRefundVO
applyRefundVO
=
new
ApplyRefundVO
();
applyRefundVO
.
setOutTradeNo
(
uavOrderDO
.
getOrderNo
());
applyRefundVO
.
setReason
(
"关闭订单"
);
applyRefundVO
.
setRefund
(
uavOrderDO
.
getOtherAmount
().
multiply
(
BigDecimal
.
valueOf
(
100
)).
longValue
());
ResultBody
applyRefund
=
paymentAppApi
.
applyRefund
(
applyRefundVO
);
if
(!
applyRefund
.
getCode
().
equals
(
ResultEnum
.
SUCCESS
.
getResultCode
()))
{
TransactionAspectSupport
.
currentTransactionStatus
().
setRollbackOnly
();
}
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
}
...
@@ -320,6 +347,7 @@ public class UavOrderServiceImpl implements UavOrderService {
...
@@ -320,6 +347,7 @@ public class UavOrderServiceImpl implements UavOrderService {
uavOrderExpressDO
.
setReceiveTime
(
new
Date
());
uavOrderExpressDO
.
setReceiveTime
(
new
Date
());
uavOrderExpressDao
.
updateUavOrderExpressDO
(
uavOrderExpressDO
);
uavOrderExpressDao
.
updateUavOrderExpressDO
(
uavOrderExpressDO
);
// TODO 订单抽成设置
// TODO 订单抽成设置
return
ResultBody
.
success
();
return
ResultBody
.
success
();
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论