update:取消时重新实现。

fengliang
1 parent 0ca5cd93
Showing 3 changed files with 12 additions and 11 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
@@ -556,11 +556,10 @@ public class OrderController {
         RLock lock = redissonClient.getLock(OrderConstant.OrderLock + orderOperateDto.getCode());
         try{
             lock.lock();
-            orderService.cancelOrder(orderOperateDto, OrderOrderState.BUYER_CANCEL);
+            return orderService.cancelOrder(orderOperateDto, OrderOrderState.BUYER_CANCEL);
         }finally {
             lock.unlock();
         }
-        return Message.success();
     }
  
     /**
@@ -579,11 +578,10 @@ public class OrderController {
         RLock lock = redissonClient.getLock(OrderConstant.OrderLock + orderOperateDto.getCode());
         try{
             lock.lock();
-            orderService.cancelOrder(orderOperateDto, OrderOrderState.SELLER_CANCEL);
+            return orderService.cancelOrder(orderOperateDto, OrderOrderState.SELLER_CANCEL);
         }finally {
             lock.unlock();
         }
-        return Message.success();
     }
  
     /**
@@ -145,7 +145,7 @@ public interface OrderService {
      * @param orderOperateDto
      * @param codeInteger
      */
-    void cancelOrder(OrderOperateDto orderOperateDto, OrderOrderState codeInteger);
+    Message cancelOrder(OrderOperateDto orderOperateDto, OrderOrderState codeInteger);
  
     /**
      * 超时取消取消订单
@@ -199,34 +199,37 @@ public class OrderServiceImpl implements OrderService {
  
     @Transactional
     @Override
-    public void cancelOrder(OrderOperateDto orderOperateDto, OrderOrderState state) {
+    public Message cancelOrder(OrderOperateDto orderOperateDto, OrderOrderState state) {
         Order order = getOrderAndCheckState(null, orderOperateDto.getCode(), orderOperateDto.getMarketId(),state,null);
         checkOperate(order,orderOperateDto,state);
         //检查是否微信支付如果是，需要额外终止微信预交款单
-        if(!cancelWeChatPay(order)){
-            throw new OrderException(OrderErrorCode.PARAM_ERROR,"存在无法取消的微信待支付信息，请等待微信支付结果或重试");
+        Message message = cancelWeChatPay(order);
+
+        if(!message.isSuccess()){
+            return message;
         }
         //退款优惠券
         orderCouponService.returnCoupon(order);
         //变更订单状态
         updateOrderByOperate(order,orderOperateDto,state.getCodeInteger(),OrderState.CANCEL.getCodeInteger());
+        return message;
     }
  
     @Transactional(rollbackFor = Exception.class)
-    public boolean cancelWeChatPay(Order order) {
+    public Message cancelWeChatPay(Order order) {
         OrderPayment orderPayment = orderPaymentService.getOrderPaymentById(order.getId(), order.getMarketId(), OrderPaymentState.WAIT_PAY.getCodeInteger());
         if(orderPayment!=null&&orderPayment.getPayChannel().equals(OrderPaymentAllChannel.BUYER_WX_CHANNEL.getCode())&&StringUtils.isNotBlank(orderPayment.getTradeId())){
             RLock lock = redissonClient.getLock(OrderConstant.OrderLock + orderPayment.getTradeId());
             try{
                 lock.lock();
                 if(StringUtils.isNotBlank(orderPayment.getTradeId())){
-                    this.wxChatPayCloseUnLock(orderPayment.getTradeId(),order.getMarketId());
+                    return this.wxChatPayCloseUnLock(orderPayment.getTradeId(),order.getMarketId());
                 }
             }finally{
                 lock.unlock();
             }
         }
-        return true;
+        return Message.success();
     }
  
     private void checkOperate(Order order, OrderOperateDto orderOperateDto, OrderOrderState state) {