Merge branch 'feature/20201110_混合支付退款_张志恒' into qa

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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2171,6 +2171,7 @@ public class OrderAdapter {
         multiQueryRequest.setNotifyUrl(refundNotifyCallback);
         multiQueryRequest.setVer("V1");
         multiQueryRequest.setVer3(false);
+        multiQueryRequest.setOutOrderNo(orderBean.getOid());
         return multiQueryRequest;
     }
 

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

@@ -3,6 +3,9 @@ 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.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
+import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
@@ -22,6 +25,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import org.springframework.test.context.junit4.SpringRunner;
+import springfox.documentation.spring.web.json.Json;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -31,11 +35,19 @@ import org.springframework.test.context.junit4.SpringRunner;
 public class MallOrderServiceImplTest {
 
     @Autowired
-    private MallOrderServiceImpl mallOrderService;
-
-    @Autowired
-    private MCCafeOrderServiceImpl mcCafeOrderService;
+    private OrderDownLoadSdkService orderDownLoadSdkService;
 
+//    @Autowired
+//    private MallOrderServiceImpl mallOrderService;
+//
+//    @Autowired
+//    private MCCafeOrderServiceImpl mcCafeOrderService;
+//
+//    @Autowired
+//    private MulitiPaymentClient mulitiPaymentClient;
+//
+//    @Autowired
+//    private OrderManagerAdapter orderManagerAdapter;
     @Autowired
     private MulitiPaymentClient mulitiPaymentClient;
     @Autowired
@@ -103,10 +115,14 @@ public class MallOrderServiceImplTest {
 //        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);
+//        OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
+//        orderManagerRequest.setOrderId("19404015572678969200003");
+//        orderManagerRequest.setPartnerId("1864");
+//        orderManagerAdapter.orderAgreeRefund(orderManagerRequest);
+        OrderConditionsReq request ;
+        String str = "{\"abnormalStatuses\":[],\"afterSalesStatus\":0,\"appId\":\"\",\"bizType\":0,\"bizTypes\":[1,6,97,98],\"dispenseStatus\":0,\"endTimestamp\":1605542399,\"endUpdateTimestamp\":0,\"expressType\":0,\"externalObjectIds\":[],\"finishStatus\":false,\"isDeleted\":0,\"mobile\":\"\",\"orderClients\":[],\"orderCode\":\"19356550932276285500005\",\"orderCodes\":[],\"orderStatus\":0,\"orderStatuses\":[],\"orderTypes\":[],\"pageNum\":1,\"pageSize\":10,\"partnerId\":\"2655\",\"payStatuses\":[2,3,4],\"payTypes\":[],\"printNum\":0,\"productId\":\"\",\"productName\":\"\",\"settlementTypes\":[],\"startTimestamp\":1604160000,\"startUpdateTimestamp\":0,\"storeIds\":[],\"suspendState\":0,\"thirdOrderCode\":\"\",\"userId\":\"\",\"userName\":\"\"}";
+        request = JSON.toJavaObject(JSON.parseObject(str),OrderConditionsReq.class);
+        orderDownLoadSdkService.queryOrderByConditions(request,"");
     }
 
 

order-management/src/main/java/cn/freemud/management/adapter/PaymentSdkAdapter.java

@@ -55,6 +55,7 @@ public class PaymentSdkAdapter {
         multiQueryRequest.setNotifyUrl(refundNotifyCallback);
         multiQueryRequest.setVer("V1");
         multiQueryRequest.setVer3(false);
+        multiQueryRequest.setOutOrderNo(orderBean.getOid());
         return multiQueryRequest;
     }
 

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

@@ -150,7 +150,7 @@ public class PaymentHandle {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
         }
         List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().getRefundPlatformResponseList();
-        refundPlatformResponseList = refundPlatformResponseList.stream().filter(m -> !m.getEbCode().equalsIgnoreCase("4")).collect(Collectors.toList());
+        refundPlatformResponseList = refundPlatformResponseList.stream().filter(m -> !m.getEbCode().equalsIgnoreCase("10102")).collect(Collectors.toList());
         if(null != refundPlatformResponseList && refundPlatformResponseList.size()>0){
             redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
         }