Merge branch 'feature/v1.0.14'

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -31,7 +31,8 @@ import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.ecology.SendMessageRequest;
 import cn.freemud.entities.dto.openplatform.QueryInvoiceConfigRequest;
 import cn.freemud.entities.dto.order.*;
-import cn.freemud.entities.dto.pay.*;
+import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
+import cn.freemud.entities.dto.pay.OrderInvoiceRequest;
 import cn.freemud.entities.dto.product.AttributeValue;
 import cn.freemud.entities.dto.product.GroupDetail;
 import cn.freemud.entities.dto.product.ProductAttributeGroup;
@@ -102,6 +103,7 @@ import com.freemud.application.sdk.api.ordercenter.enums.orderv1.*;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
 import com.freemud.application.sdk.api.ordercenter.request.*;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
@@ -109,7 +111,6 @@ import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
@@ -2088,16 +2089,23 @@ public class OrderServiceImpl implements Orderservice {
                 //获取支付返回退款状态
                 state = PayRefundStatus.SUCCESS.getCode();
             } else {
-                //调用支付退款
-                PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
-                //抖音支付退款必传
-                orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
-                response = payServiceImpl.orderRefund(orderPayRefundRequest);
-                if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
-                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                OrderExtendedReq ext = orderBean.getOrderExtended();
+                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
+                    //代付人信息不为空  并且和订单创建人不一样，表示代付单
+                    PayRefundResponse resp = paymentHandle.agentPayRefund(orderBean);
+                    state = resp.getPayRefundStatus().getCode();
+                } else {
+                    //调用支付退款
+                    PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                    //抖音支付退款必传
+                    orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
+                    response = payServiceImpl.orderRefund(orderPayRefundRequest);
+                    if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
+                        return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                    }
+                    //获取支付返回退款状态
+                    state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
                 }
-                //获取支付返回退款状态
-                state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
             }
         }
 

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -122,11 +122,10 @@ public class PaymentHandle {
     /**
      * 代付订单退款
      *
-     * @param request
      * @param orderBean
      * @return
      */
-    public PayRefundResponse agentPayRefund(OrderManagerRequest request, OrderBeanV1 orderBean) {
+    public PayRefundResponse agentPayRefund(OrderBeanV1 orderBean) {
         PayRefundResponse ret = new PayRefundResponse();
         try {
             OrderExtInfoDto ext = JSON.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -250,7 +250,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
                 OrderExtendedReq ext = orderBean.getOrderExtended();
                 if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
                     //代付人信息不为空  并且和订单创建人不一样，表示代付单
-                    refundResponse = paymentHandle.agentPayRefund(request, orderBean);
+                    refundResponse = paymentHandle.agentPayRefund(orderBean);
                 } else {
                     //正常订单现金退款
                     refundResponse = paymentHandle.refund(request, orderBean);