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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1193,6 +1193,8 @@ public class OrderSdkAdapter {
         data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
         //发票信息
         data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
+        data.setPayChannelType(orderInfoReqs.getPayChannelType());
+        data.setPickUpGoodsNo(orderInfoReqs.getPickUpGoodsNo());
         //todo:混合支付
         if (CollectionUtils.isNotEmpty(orderInfoReqs.getOrderPayItemCreateReqList())) {
             data.setOrderPayItem(this.getOrderItemPayList(orderInfoReqs.getOrderPayItemCreateReqList()));

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

@@ -12,7 +12,6 @@
  */
 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;
@@ -417,11 +416,9 @@ public class QueryOrdersResponse {
              */
             private String downstreamThirdOrderCode;
 
-
             /**
              * 混合支付list
              */
-            //订单支付详情
             private List<OrderPayItem> orderPayItem;
 
             @NoArgsConstructor

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -280,12 +280,6 @@ public class QueryOrdersResponseDto {
              */
             private BigDecimal weight;
 
-
-            /**
-             * 混合支付详情
-             */
-            private List<OrderPayItemResp> orderPayItemCreateReqList;
-
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -161,6 +161,8 @@ public enum ResponseResult {
     ORDER_NO_PAU("45063", "订单未支付"),
     ORDER_PICK_UP_GOOD_NO("45064", "更新取餐码失败"),
     ORDER_NOT_CREATE_ERROR("45065", "请不要重复创建订单"),
+    MULTIORDER__ERRORREFUND("45005", "订单申请退款失败"),
+
 
     /**
      * 支付

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

@@ -1747,16 +1747,15 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
-            if(null != orderBean.getOrderPayItemCreateReqList() && orderBean.getOrderPayItemCreateReqList().size()>0){
+            if(null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size()>0){
                 //调用支付退款
                 MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
                 MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
                 if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
-                    return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
+                    return ResponseUtil.error(ResponseResult.MULTIORDER__ERRORREFUND.getCode(), "multiOrderRefund_failed");
                 }
 
                 List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
-                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);
                 }
@@ -1926,6 +1925,7 @@ public class OrderServiceImpl implements Orderservice {
         req.setPartnerId(vo.getPartnerId());
         req.setImgUlr(vo.getImgUrl());
         req.setMobile(userInfo.getMobile());
+        req.setOperator(userInfo.getNickName());
         //积分订单为4
         req.setOrderType((byte) 4);
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());

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

@@ -165,11 +165,9 @@ public class PaymentHandle {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
         }
         List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
-        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);
         }
-
         return handlePayRefundResponse(refundStatus,multiOrderRefundRequest.getRefundTradeNo());
     }
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCreateReq.java

@@ -87,5 +87,10 @@ public class ParkingOrderCreateReq {
      */
     private Byte orderType;
 
+    /**
+     * 操作人
+     */
+    private String operator;
+
    
 }