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

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

@@ -23,7 +23,7 @@ public class MultiOrderRefundResponse<T> {
     }
 
     @Data
-    public class RefundPlatformResponse{
+    public static class RefundPlatformResponse{
         private String endTransTradeNo;
         private String fmRefundNo;
         private String fmTradeNo;
@@ -39,6 +39,6 @@ public class MultiOrderRefundResponse<T> {
         private Integer settleRefundAmount;
         private Integer totalAmount;
         private String transId;
-        private String ebCode;
+        private String ebcode;
     }
 }
\ No newline at end of file

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

@@ -1766,7 +1766,7 @@ public class OrderServiceImpl implements Orderservice {
                     return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
                 }
                 List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
-                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);
                 }

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().refundPlatformResponseList;
-        refundPlatformResponseList = refundPlatformResponseList.stream().filter(m -> !m.getEbCode().equalsIgnoreCase("10102")).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);
         }