提交 f4d6c0f5 authored 作者: hzh's avatar hzh

代码优化

上级 58820101
...@@ -18,7 +18,7 @@ public interface RemoteOrderService { ...@@ -18,7 +18,7 @@ public interface RemoteOrderService {
* @param order 订单信息 * @param order 订单信息
* @return 订单支付信息 * @return 订单支付信息
*/ */
String createOrder(RemoteSaveOrder order); String createOrder(RemoteSaveOrder order) throws Exception;
/** /**
* 查询订单列表 * 查询订单列表
......
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<module>ruoyi-common-sse</module> <module>ruoyi-common-sse</module>
<module>ruoyi-common-weixin</module> <module>ruoyi-common-weixin</module>
<module>ruoyi-common-ys</module> <module>ruoyi-common-ys</module>
<module>ruoyi-common-pay</module>
</modules> </modules>
<artifactId>ruoyi-common</artifactId> <artifactId>ruoyi-common</artifactId>
......
org.dromara.common.pay.config.WechatPayConfiguration org.dromara.common.pay.config.WechatPayConfiguration
org.dromara.common.pay.service.IWxPayService org.dromara.common.pay.service.impl.WxPayServiceImpl
...@@ -54,7 +54,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService { ...@@ -54,7 +54,7 @@ public class RemoteOrderServiceImpl implements RemoteOrderService {
@GlobalTransactional(rollbackFor = Exception.class) @GlobalTransactional(rollbackFor = Exception.class)
@Override @Override
public String createOrder(RemoteSaveOrder remoteOrder) { public String createOrder(RemoteSaveOrder remoteOrder) throws Exception {
ValidatorUtils.validate(remoteOrder); ValidatorUtils.validate(remoteOrder);
//查询订单信息 //查询订单信息
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
......
...@@ -21,7 +21,7 @@ public interface IPayStrategy { ...@@ -21,7 +21,7 @@ public interface IPayStrategy {
* @param tradeType 支付类型 * @param tradeType 支付类型
* @return 支付信息 * @return 支付信息
*/ */
static String pay(String tradeBody, List<OrderFeeVo> feeList, String tradeType) { static String pay(String tradeBody, List<OrderFeeVo> feeList, String tradeType) throws Exception {
// 授权类型和客户端id // 授权类型和客户端id
String beanName = tradeType + BASE_NAME; String beanName = tradeType + BASE_NAME;
if (!SpringUtils.containsBean(beanName)) { if (!SpringUtils.containsBean(beanName)) {
......
...@@ -32,7 +32,7 @@ public class OrderController { ...@@ -32,7 +32,7 @@ public class OrderController {
* 下单支付接口 * 下单支付接口
*/ */
@PostMapping("/pay") @PostMapping("/pay")
public R<Object> pay(@Validated @RequestBody OrderPayVo vo) { public R<Object> pay(@Validated @RequestBody OrderPayVo vo) throws Exception {
OrderType ot = OrderType.getEnum(vo.getOrderType()); OrderType ot = OrderType.getEnum(vo.getOrderType());
return R.ok(service.createOrder(vo.getOrderNo(), ot)); return R.ok(service.createOrder(vo.getOrderNo(), ot));
} }
......
...@@ -18,7 +18,7 @@ public interface IPayOrderService { ...@@ -18,7 +18,7 @@ public interface IPayOrderService {
* @param orderType 订单类型 * @param orderType 订单类型
* @return 订单号 * @return 订单号
*/ */
String createOrder(String orderNo, OrderType orderType); String createOrder(String orderNo, OrderType orderType) throws Exception;
/** /**
* 查询订单列表 * 查询订单列表
......
...@@ -26,7 +26,7 @@ public class PayOrderServiceImpl implements IPayOrderService { ...@@ -26,7 +26,7 @@ public class PayOrderServiceImpl implements IPayOrderService {
private RemoteOrderService remoteOrderService; private RemoteOrderService remoteOrderService;
@Override @Override
public String createOrder(String orderNo, OrderType orderType) { public String createOrder(String orderNo, OrderType orderType) throws Exception {
RemoteSaveOrder order = IOrderStrategy.createOrder(orderNo, orderType); RemoteSaveOrder order = IOrderStrategy.createOrder(orderNo, orderType);
order.setSource(Source.YSH); order.setSource(Source.YSH);
order.setOriginOrderNo(orderNo); order.setOriginOrderNo(orderNo);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论