Merge branch 'feature/rui.zhu/退款接口逻辑调整' into develop

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -105,7 +105,7 @@ public class OrderCallBackMQService {
         this.sendOrderStatusProcessCenterMQ(body);
 
         //支付宝订单状态变更上报
-        sendzfbOrderMQ(body);
+//        sendzfbOrderMQ(body);
     }
 
     /**
@@ -411,25 +411,25 @@ public class OrderCallBackMQService {
         }
     }
 
-    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
-        try {
-            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
-                return;
-            }
-            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
-                return;
-            }
-            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
-
-            // 支付宝订单状态推送　tapd需求id 1032865
-            if ("1".equals(body.getMsgType())) {
-                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
-                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
-                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
-                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
-            }
-        } catch (Exception e) {
-            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
-        }
-    }
+//    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
+//        try {
+//            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
+//                return;
+//            }
+//            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
+//                return;
+//            }
+//            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
+//
+//            // 支付宝订单状态推送　tapd需求id 1032865
+//            if ("1".equals(body.getMsgType())) {
+//                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
+//                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
+//                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
+//                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
+//            }
+//        } catch (Exception e) {
+//            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
+//        }
+//    }
 }

order-application-service/src/main/java/cn/freemud/service/RefundService.java

@@ -145,7 +145,7 @@ public class RefundService {
         // 未接单
         if (NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(order.getOrderState())) {
             // 商家未接单逻辑处理    1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
-            refundOrder(order, reason, remark, refundDeliveryFee, refundMode);
+            refundOrder(order, isPartRefund, reason, remark, refundDeliveryFee, refundMode);
             orderQueueService.backOrdersStatusChange(order.getOrderCode(), orderSdkAdapter.getOldStatus(order.getOrderState()), order.getPayState(), order.getPartnerId());
         } else {
             // 已接单的，创建售后单
@@ -287,7 +287,7 @@ public class RefundService {
      * 商家未接单,取消订单逻辑处理
      * 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
      */
-    private void refundOrder(OrderInfoReqs order, String reason, String remark, Boolean isRefundDeliveryFee, Byte refundMode) {
+    private void refundOrder(OrderInfoReqs order, Boolean isPartRefund, String reason, String remark, Boolean isRefundDeliveryFee, Byte refundMode) {
         int state = PayRefundStatus.SUCCESS.getCode();
         List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>();
         PayRefundResponse refundResponse = null;
@@ -304,7 +304,7 @@ public class RefundService {
         }
         Long refundAmount = refundResponse != null ? refundResponse.getRefundAmount().longValue() : null;
         OrderCancelReq req = OrderCancelReqAdapter.convert(order, UUID.randomUUID().toString(),
-                AfterSalesType.USER_CANCEL, true, refundAmount, reason, remark, isRefundDeliveryFee, refundMode);
+                AfterSalesType.USER_CANCEL, isPartRefund, refundAmount, reason, remark, isRefundDeliveryFee, refundMode);
         req.setRefundState(AfterSalesRefunStateEnum.STATE_4.getIndex());
         if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
             //退款成功