Forráskód Böngészése

联调修复退款bug

zhangxin 1 hete
szülő
commit
84a7e1d604

+ 2 - 2
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/smqjh/XSBRefundOrderController.java

@@ -52,8 +52,8 @@ public class XSBRefundOrderController {
     /**
      * 取消退款订单申请
      */
-    @GetMapping("/cancel")
-    public R<String> cancel(OrderRefundCancelVo orderRefundCancelVo) {
+    @PostMapping("/cancel")
+    public R<String> cancel(@RequestBody OrderRefundCancelVo orderRefundCancelVo) {
         return  xsbRefundOrderService.cancel(orderRefundCancelVo);
     }
 

+ 1 - 1
yami-shop-service/src/main/java/com/yami/shop/service/xsb/impl/XSBRefundOrderServiceImpl.java

@@ -315,7 +315,7 @@ public class XSBRefundOrderServiceImpl implements XSBRefundOrderService {
         Order order = orderService.getOrderByOrderNumber(orderRefund.getOrderNumber());
 
 
-        if (!Objects.equals(order.getUserId(),orderRefundCancelVo.getUserId().toString())) {
+        if (!Objects.equals(orderRefund.getUserId(),orderRefundCancelVo.getUserId().toString())) {
             throw new GlobalException("申请失败,您没有此权限");
         }
         //如果订单状态为待发货、包含运费、单个商品退款,且所有订单项都进行退款,则不能再取消退款(取消退款后再退款会导致重复退运费bug)