Merge remote-tracking branch 'origin/develop' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -12,6 +12,7 @@
  */
 package com.freemud.sdk.api.assortment.order.response.order;
 
+import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInvoice;
@@ -420,6 +421,8 @@ public class QueryOrdersResponse {
             /**
              * 混合支付list
              */
+            //订单支付详情
+            private List<OrderPayItemResp> orderPayItemCreateReqList;
             private List<OrderPayItem> orderPayItem;
 
             @NoArgsConstructor

order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java

 package cn.freemud.service.impl;
 
+import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
+import cn.freemud.management.service.adapter.OrderManagerAdapter;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
@@ -28,6 +30,9 @@ public class MallOrderServiceImplTest {
     @Autowired
     private MulitiPaymentClient mulitiPaymentClient;
 
+    @Autowired
+    private OrderManagerAdapter orderManagerAdapter;
+
 //    @Before
 //    public void before() throws Exception {
 //    }
@@ -73,20 +78,24 @@ public class MallOrderServiceImplTest {
 
     @Test
     public void test() {
-        MultiOrderRefundRequest multiOrderRefundRequest = new MultiOrderRefundRequest();
-        multiOrderRefundRequest.setFmId("");
-        multiOrderRefundRequest.setVer3(false);
-        multiOrderRefundRequest.setVer("V1");
-        multiOrderRefundRequest.setNotifyUrl("http://open-store-order-application-service.open-store.svc:9212/order/refundNotifyCallback");
-        multiOrderRefundRequest.setOperatorId("1");
-        multiOrderRefundRequest.setPartnerId("1864");
-        multiOrderRefundRequest.setRefundAmount(1L);
-        multiOrderRefundRequest.setRefundTradeNo("1604886134387{{$timestamp}}");
-        multiOrderRefundRequest.setStationId("1");
-        multiOrderRefundRequest.setStoreId("999999998");
-        multiOrderRefundRequest.setOutOrderNo("3900472893821604933666");
-        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponseDto = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,"1864");
-        System.out.println(2345678);
+//        MultiOrderRefundRequest multiOrderRefundRequest = new MultiOrderRefundRequest();
+//        multiOrderRefundRequest.setFmId("");
+//        multiOrderRefundRequest.setVer3(false);
+//        multiOrderRefundRequest.setVer("V1");
+//        multiOrderRefundRequest.setNotifyUrl("http://open-store-order-application-service.open-store.svc:9212/order/refundNotifyCallback");
+//        multiOrderRefundRequest.setOperatorId("1");
+//        multiOrderRefundRequest.setPartnerId("1864");
+//        multiOrderRefundRequest.setRefundAmount(1L);
+//        multiOrderRefundRequest.setRefundTradeNo("1604886134387{{$timestamp}}");
+//        multiOrderRefundRequest.setStationId("1");
+//        multiOrderRefundRequest.setStoreId("999999998");
+//        multiOrderRefundRequest.setOutOrderNo("3900472893821604933666");
+//        MultiOrderRefundResponse<MultiOrderRefundResponse.Data> multiOrderRefundResponseDto = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,"1864");
+//        System.out.println(2345678);
+        OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
+        orderManagerRequest.setOrderId("19404015572678969200003");
+        orderManagerRequest.setPartnerId("1864");
+        orderManagerAdapter.orderAgreeRefund(orderManagerRequest);
     }
 
 

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

@@ -128,7 +128,11 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
+            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
+                refundResponse = paymentHandle.multiRefund(orderBean);
+            }else{
                 refundResponse = paymentHandle.refund(request, orderBean);
+            }
         } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
             return ResponseUtil.error(orderEx.getResult());
         }
@@ -158,11 +162,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if(orderBean.getPayChannelType() != "4"){
-                refundResponse = paymentHandle.refund(request, orderBean);
-            }else{
+            if(orderBean.getPayChannelType().equalsIgnoreCase("4")){
                 refundResponse = paymentHandle.multiRefund(orderBean);
-
+            }else{
+                refundResponse = paymentHandle.refund(request, orderBean);
             }
         } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
             return ResponseUtil.error(orderEx.getResult());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderPayItemResp.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderPayItemResp {
+    private Long id;
+
+    private Long orderId;
+
+    private String orderCode;
+
+    private String partnerId;
+
+    private String storeId;
+
+    private String payChannelType;
+
+    private String payChannelName;
+
+    private String operator;
+
+    private BigDecimal payAmount;
+
+    private String transId;
+
+    private String fmTradeNo;
+
+    private String outOrderNo;
+
+    private String platformTradeNo;
+
+    private String endTransTradeNo;
+}
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -13,6 +13,8 @@
 package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
 
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp;
+import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import lombok.Data;
 
 import java.math.BigDecimal;