订单聚合层去除支付sdk

order-application-service/pom.xml

@@ -338,16 +338,16 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.17.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>com.freemud.sdk.api.assortment</groupId>
-            <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.10.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.freemud.application.service.sdk</groupId>-->
+<!--            <artifactId>paymentcenter-sdk</artifactId>-->
+<!--            <version>2.9.17.RELEASE</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.freemud.sdk.api.assortment</groupId>-->
+<!--            <artifactId>assortment-payment-sdk</artifactId>-->
+<!--            <version>2.6.10.RELEASE</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>

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

@@ -48,12 +48,9 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 import com.freemud.sdk.api.assortment.order.request.payment.PayPlatformVO;
 import com.freemud.sdk.api.assortment.order.request.payment.ProductVO;
-//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.util.ClassUtils;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
-import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
-import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -111,43 +108,43 @@ public class CreateOrderAdapter {
     /**
      * 支付信息转换
      */
-    public UnifiedOrderRequest convent2UnifiedOrderRequest(OrderBeanV1 orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
-        UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
-        orderPayDto.setPartnerId(orderBean.getCompanyId());
-        orderPayDto.setBody(paymentRequest.getPrincipalName());
-        orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
-        orderPayDto.setStoreId(orderBean.getShopId());
-        orderPayDto.setTransId(transId);
-        orderPayDto.setOpenId(paymentRequest.getOpenId());
-        String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
-        orderPayDto.setBusinessDate(businessDate);
-        orderPayDto.setAmount(amount);
-        orderPayDto.setUndisAmount(1L);
-        orderPayDto.setVipAmount(Long.valueOf(cardAmount));
-        orderPayDto.setAppId(paymentRequest.getWxAppId());
-        orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
-        List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
-        if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
-            orderBean.getProductList().forEach(orderProductBean -> {
-                UnifiedOrderRequest.ProductBean productBean = new UnifiedOrderRequest.ProductBean();
-                productBean.setPid(orderProductBean.getProductId());
-                productBean.setConsumeNum(orderProductBean.getNumber());
-                productBean.setSeq(orderProductBean.getSequence());
-                productBean.setSalesType("NORMAL");
-                productBean.setPrice(orderProductBean.getPrice());
-                productBean.setName(orderProductBean.getProductName());
-                productBeans.add(productBean);
-            });
-        }
-        orderPayDto.setProducts(productBeans);
-        orderPayDto.setPayCode(paymentRequest.getPayCode());
-        //抖音支付的payCode = 10066
-        if (OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
-            orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
-        }
-        orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
-        return orderPayDto;
-    }
+//    public UnifiedOrderRequest convent2UnifiedOrderRequest(OrderBeanV1 orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
+//        UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
+//        orderPayDto.setPartnerId(orderBean.getCompanyId());
+//        orderPayDto.setBody(paymentRequest.getPrincipalName());
+//        orderPayDto.setNotifyUrl(paymentRequest.getReverseNotifyiDcUrl());
+//        orderPayDto.setStoreId(orderBean.getShopId());
+//        orderPayDto.setTransId(transId);
+//        orderPayDto.setOpenId(paymentRequest.getOpenId());
+//        String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
+//        orderPayDto.setBusinessDate(businessDate);
+//        orderPayDto.setAmount(amount);
+//        orderPayDto.setUndisAmount(1L);
+//        orderPayDto.setVipAmount(Long.valueOf(cardAmount));
+//        orderPayDto.setAppId(paymentRequest.getWxAppId());
+//        orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
+//        List<UnifiedOrderRequest.ProductBean> productBeans = new ArrayList<UnifiedOrderRequest.ProductBean>();
+//        if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
+//            orderBean.getProductList().forEach(orderProductBean -> {
+//                UnifiedOrderRequest.ProductBean productBean = new UnifiedOrderRequest.ProductBean();
+//                productBean.setPid(orderProductBean.getProductId());
+//                productBean.setConsumeNum(orderProductBean.getNumber());
+//                productBean.setSeq(orderProductBean.getSequence());
+//                productBean.setSalesType("NORMAL");
+//                productBean.setPrice(orderProductBean.getPrice());
+//                productBean.setName(orderProductBean.getProductName());
+//                productBeans.add(productBean);
+//            });
+//        }
+//        orderPayDto.setProducts(productBeans);
+//        orderPayDto.setPayCode(paymentRequest.getPayCode());
+//        //抖音支付的payCode = 10066
+//        if (OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
+//            orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
+//        }
+//        orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
+//        return orderPayDto;
+//    }
 
     /**
      * 预支付接口获取类型
@@ -173,39 +170,39 @@ public class CreateOrderAdapter {
         return foodOrderType;
     }
 
-    public OrderPayResponse convent2OrderPayResponse(UnifiedOrderResponse unifiedOrderResponse) {
-        OrderPayResponse responseDto = new OrderPayResponse();
-        responseDto.setFmId(unifiedOrderResponse.getFmId());
-        responseDto.setMsg(unifiedOrderResponse.getMsg());
-        responseDto.setPayEbcode(unifiedOrderResponse.getPayEbcode());
-        responseDto.setPayId(unifiedOrderResponse.getPayId());
-        UnifiedOrderResponse.PayOrderBean payOrderBean = unifiedOrderResponse.getPayOrder();
-        if (null != payOrderBean) {
-            OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
-            payBean.setAppid(payOrderBean.getAppid());
-            payBean.setNonceStr(payOrderBean.getNonceStr());
-            payBean.setPackageX(payOrderBean.getPackageX());
-            payBean.setSign(payOrderBean.getSign());
-            payBean.setSignType(payOrderBean.getSignType());
-            payBean.setTimestamp(payOrderBean.getTimestamp());
-            payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
-            responseDto.setPayOrder(payBean);
-            // coco 机场支付
-            try {
-                JSONObject jsonObject = JSONObject.parseObject(payOrderBean.getAliPayOrder());
-                responseDto.setSellerId(jsonObject.getString("sellerId"));
-                responseDto.setPayNotifyUrl(jsonObject.getString("payNotifyUrl"));
-                responseDto.setEbCode(jsonObject.getString("ebCode"));
-            } catch (Exception e) {
-
-            }
-        }
-        responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
-        responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
-        responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
-        responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
-        return responseDto;
-    }
+//    public OrderPayResponse convent2OrderPayResponse(UnifiedOrderResponse unifiedOrderResponse) {
+//        OrderPayResponse responseDto = new OrderPayResponse();
+//        responseDto.setFmId(unifiedOrderResponse.getFmId());
+//        responseDto.setMsg(unifiedOrderResponse.getMsg());
+//        responseDto.setPayEbcode(unifiedOrderResponse.getPayEbcode());
+//        responseDto.setPayId(unifiedOrderResponse.getPayId());
+//        UnifiedOrderResponse.PayOrderBean payOrderBean = unifiedOrderResponse.getPayOrder();
+//        if (null != payOrderBean) {
+//            OrderPayResponse.PayOrderBean payBean = new OrderPayResponse.PayOrderBean();
+//            payBean.setAppid(payOrderBean.getAppid());
+//            payBean.setNonceStr(payOrderBean.getNonceStr());
+//            payBean.setPackageX(payOrderBean.getPackageX());
+//            payBean.setSign(payOrderBean.getSign());
+//            payBean.setSignType(payOrderBean.getSignType());
+//            payBean.setTimestamp(payOrderBean.getTimestamp());
+//            payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
+//            responseDto.setPayOrder(payBean);
+//            // coco 机场支付
+//            try {
+//                JSONObject jsonObject = JSONObject.parseObject(payOrderBean.getAliPayOrder());
+//                responseDto.setSellerId(jsonObject.getString("sellerId"));
+//                responseDto.setPayNotifyUrl(jsonObject.getString("payNotifyUrl"));
+//                responseDto.setEbCode(jsonObject.getString("ebCode"));
+//            } catch (Exception e) {
+//
+//            }
+//        }
+//        responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
+//        responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
+//        responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
+//        responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
+//        return responseDto;
+//    }
 
     public OrderPayResponse getOrderPayResponse(String partnerId, PaymentRequest paymentRequest, String orderId, String fmId) {
         OrderPayResponse orderPayResponse = new OrderPayResponse();

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

@@ -98,6 +98,8 @@ import org.apache.commons.lang.time.FastDateFormat;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
+
 
 import java.awt.geom.Point2D;
 import java.math.BigDecimal;
@@ -2123,8 +2125,8 @@ public class OrderAdapter {
     }
 
 
-    public com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest getOrderPayRefundRequest(OrderBeanV1 orderBean, Long refundId, String fatherOrderId) {
-        com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = new com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest();
+    public OrderRefundRequest getOrderPayRefundRequest(OrderBeanV1 orderBean, Long refundId, String fatherOrderId) {
+        OrderRefundRequest orderPayRefundRequest = new OrderRefundRequest();
         orderPayRefundRequest.setOrgTransId(fatherOrderId);
         orderPayRefundRequest.setPartnerId(orderBean.getCompanyId());
         orderPayRefundRequest.setStoreId(orderBean.getShopId());

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

+package cn.freemud.entities.dto.pay;
+
+public class UnifiedOrderRequest {
+}

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

@@ -45,7 +45,9 @@ import cn.freemud.enums.*;
 import cn.freemud.handler.WeChatLiveMsgHandle;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
+import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
 import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse;
+import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
 import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
 import cn.freemud.management.service.handle.ActivityHandle;
 import cn.freemud.manager.OrderManager;
@@ -105,14 +107,12 @@ import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushServic
 import com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderRefundConfigEntity;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
-import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.enums.QueryDeliveryType;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
-import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
@@ -137,6 +137,7 @@ import java.util.stream.Collectors;
 import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 
 
+
 @Service
 public class OrderServiceImpl implements Orderservice {
 
@@ -2114,7 +2115,7 @@ public class OrderServiceImpl implements Orderservice {
                 state = PayRefundStatus.SUCCESS.getCode();
             } else {
                 //调用支付退款
-                com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
                 //抖音支付退款必传
                 orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
                 response = payServiceImpl.orderRefund(orderPayRefundRequest);

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

@@ -21,11 +21,10 @@ import cn.freemud.entities.vo.order.PlugInParameter;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request;
+import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
-import cn.freemud.management.entities.dto.response.pay.PayBatchRefundResponse;
-import cn.freemud.management.entities.dto.response.pay.PayRefundData;
-import cn.freemud.management.entities.dto.response.pay.PayRefundResponseDto;
+import cn.freemud.management.entities.dto.response.pay.*;
 import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
 import cn.freemud.management.thirdparty.OMSPaymentClient;
@@ -67,12 +66,6 @@ import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
 import com.freemud.sdk.api.assortment.order.request.order.PaymentRequest;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
-import com.freemud.sdk.api.assortment.payment.constant.ConstantPaymentReqType;
-import com.freemud.sdk.api.assortment.payment.constant.ResponseConstant;
-import com.freemud.sdk.api.assortment.payment.enums.PaymentRefundStatus;
-import com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest;
-import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
-import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -833,7 +826,7 @@ public class PayServiceImpl {
     /**
      * 支付退款
      */
-    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest) {
+    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(OrderRefundRequest orderPayRefundRequest) {
         return orderRefundNew(orderPayRefundRequest);
     }
 

order-management/pom.xml

@@ -63,17 +63,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.freemud.sdk.api.assortment</groupId>
-            <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.10.RELEASE</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.freemud.application.service.sdk</groupId>
-            <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.17.RELEASE</version>
-        </dependency>
-        <dependency>
             <artifactId>structure-center-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
             <version>1.2.3.RELEASE</version>

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

 package cn.freemud.management.adapter;
 
+import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
@@ -30,8 +31,8 @@ public class PaymentSdkAdapter {
     @Value("${saas.refund.notify.callback}")
     private String refundNotifyCallback;
 
-    public com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest getOrderRefundRequest(OrderBeanV1 orderBean, BigDecimal refundAmount) {
-        com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest refundRequestDTO = new com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest();
+    public OrderRefundRequest getOrderRefundRequest(OrderBeanV1 orderBean, BigDecimal refundAmount) {
+        OrderRefundRequest refundRequestDTO = new OrderRefundRequest();
         refundRequestDTO.setPartnerId(orderBean.getCompanyId());
         refundRequestDTO.setStoreId(orderBean.getShopId());
         refundRequestDTO.setOrgTransId(orderBean.getOid());

order-management/src/main/java/cn/freemud/management/entities/dto/request/pay/OrderRefundRequest.java

+package cn.freemud.management.entities.dto.request.pay;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class OrderRefundRequest {
+
+    private String appId;
+    private String partnerId;
+    private String operatorId = "1";
+    private String stationId = "1";
+    private String storeId;
+    private String payCode;
+    private String payTimeOutTime;
+    private Map<String, String> extendParams;
+
+
+    private Long refundId;
+    private String orgTransId;
+//    private String partnerId;
+    private String openid;
+    private String businessDate;
+    private String refundDesc;
+    private String notifyUrl;
+    private String orgPayFmId;
+    private Long refundAmount;
+    private Long totalAmount;
+
+}

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/OrderRefundResponse.java

+package cn.freemud.management.entities.dto.response.pay;
+
+import lombok.Data;
+
+@Data
+public class OrderRefundResponse {
+
+    private Integer statusCode;
+    private String msg;
+    private String thirdPartTradeNo;
+    private String tradeNo;
+    private String refundTradeNo;
+    private String thirdPartRefundTradeNo;
+    private Long refundAmount;
+    private Long totalAmount;
+    private Integer refundStatus;
+
+}

order-management/src/main/java/cn/freemud/management/enums/PaymentRefundStatus.java

+package cn.freemud.management.enums;
+
+public enum PaymentRefundStatus {
+
+    PAYMENT_REFUND_STATUS_1(1, "退款成功"),
+    PAYMENT_REFUND_STATUS_2(2, "退款失败"),
+    PAYMENT_REFUND_STATUS_4(4, "退款处理中");
+
+    private Integer code;
+    private String desc;
+
+    private PaymentRefundStatus(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+}

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

@@ -2,12 +2,11 @@ package cn.freemud.management.service.handle;
 
 import cn.freemud.management.adapter.PaymentSdkAdapter;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
+import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.request.pay.PaymentQueryOrderRequestDto;
-import cn.freemud.management.entities.dto.response.pay.PayRefundData;
-import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
-import cn.freemud.management.entities.dto.response.pay.PayRefundResponseDto;
-import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponseDto;
+import cn.freemud.management.entities.dto.response.pay.*;
+import cn.freemud.management.enums.PaymentRefundStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.thirdparty.MulitiPaymentClient;
@@ -28,11 +27,6 @@ import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
-import com.freemud.sdk.api.assortment.payment.constant.ConstantPaymentReqType;
-import com.freemud.sdk.api.assortment.payment.constant.ResponseConstant;
-import com.freemud.sdk.api.assortment.payment.enums.PaymentRefundStatus;
-import com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest;
-import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -60,6 +54,10 @@ import java.util.concurrent.TimeUnit;
 public class PaymentHandle {
 
     private static final String SUCCESS="100";
+    public static final Integer SUCCESS_RESPONSE_CODE_INT = 100;
+
+    public static final Integer REFUND_RESPONSE_CODE = 8200305;
+
 
     @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
@@ -266,7 +264,7 @@ public class PaymentHandle {
         request.setRefundDesc(refundRequest.getRefundDesc());
         request.setNotifyUrl(refundRequest.getNotifyUrl());
         request.setPartnerId(refundRequest.getPartnerId());
-        request.setVer(Integer.valueOf(ConstantPaymentReqType.version));
+        request.setVer(2);
         request.setExtendParams(refundRequest.getExtendParams());
         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> checkParam = this.checkParam(refundRequest.getPartnerId(), refundRequest.getStoreId(), refundRequest.getRefundAmount(), wxAppStore);
         if (!Objects.equals(checkParam.getCode(), "100")) {
@@ -321,10 +319,10 @@ public class PaymentHandle {
 
 
     public Integer getRefundStatus(Integer resultCode) {
-        if (Objects.equals(resultCode, ResponseConstant.SUCCESS_RESPONSE_CODE_INT)) {
+        if (Objects.equals(resultCode, SUCCESS_RESPONSE_CODE_INT)) {
             return PaymentRefundStatus.PAYMENT_REFUND_STATUS_1.getCode();
         } else {
-            return Objects.equals(resultCode, ResponseConstant.REFUND_RESPONSE_CODE) ? PaymentRefundStatus.PAYMENT_REFUND_STATUS_4.getCode() : PaymentRefundStatus.PAYMENT_REFUND_STATUS_2.getCode();
+            return Objects.equals(resultCode, REFUND_RESPONSE_CODE) ? PaymentRefundStatus.PAYMENT_REFUND_STATUS_4.getCode() : PaymentRefundStatus.PAYMENT_REFUND_STATUS_2.getCode();
         }
     }