支付OrderRefundRequest 类与订单区分

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

@@ -45,7 +45,7 @@ import cn.freemud.enums.ResponseResult;
 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.redis.RedisCache;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.BarcodeUtil;
@@ -104,9 +104,6 @@ import java.util.stream.Stream;
 
 import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
 
-//import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
-//import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
-
 
 @Component
 public class OrderAdapter {
@@ -2120,14 +2117,14 @@ public class OrderAdapter {
     }
 
 
-    public OrderRefundRequest getOrderPayRefundRequest(OrderBeanV1 orderBean, Long refundId, String fatherOrderId) {
-        OrderRefundRequest orderPayRefundRequest = new OrderRefundRequest();
+    public PayRefundRequestDto getOrderPayRefundRequest(OrderBeanV1 orderBean, Long refundId, String fatherOrderId) {
+        PayRefundRequestDto orderPayRefundRequest = new PayRefundRequestDto();
         orderPayRefundRequest.setOrgTransId(fatherOrderId);
         orderPayRefundRequest.setPartnerId(orderBean.getCompanyId());
         orderPayRefundRequest.setStoreId(orderBean.getShopId());
         orderPayRefundRequest.setOrgPayFmId(orderBean.getPayVoucher());
         orderPayRefundRequest.setRefundAmount(orderBean.getAmount());
-        orderPayRefundRequest.setRefundId(refundId);
+        orderPayRefundRequest.setRefundId(refundId.toString());
         OrderExtInfoDto orderExtInfoDTO = gson.fromJson(orderBean.getExtInfo(), OrderExtInfoDto.class);
         orderPayRefundRequest.setOpenid(orderExtInfoDTO != null ? orderExtInfoDTO.getOpenid() : "");
         orderPayRefundRequest.setAppId(orderExtInfoDTO != null ? orderExtInfoDTO.getAppid() : "");

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

@@ -53,7 +53,7 @@ import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.management.entities.dto.request.order.MCCafeCouponRequest;
 import cn.freemud.management.entities.dto.request.order.MCCafeCouponVo;
-import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
+import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
 import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
 import cn.freemud.management.enums.OrderSource;
@@ -1389,7 +1389,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
         if (orderBean.getAmount() != 0) {
             //调用支付退款
-            OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+            PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
             Map<String, String> extendParams = new HashMap<>();
             if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
                 extendParams.put("mealType", "delivery");

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

@@ -3,16 +3,12 @@ package cn.freemud.service.impl;
 import cn.freemud.adapter.DeliveryAdapter;
 import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
 import cn.freemud.adapter.OrderAdapter;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQAction;
-import cn.freemud.amqp.MQMessage;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.bo.CreateOrderBONew;
-import cn.freemud.entities.dto.PayAccessResponse;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
 import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
@@ -30,6 +26,8 @@ import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
+import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
+import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
 import cn.freemud.manager.SpellGroupOrderDataManager;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
@@ -57,7 +55,6 @@ import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrd
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
 import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
 import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
-import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
@@ -71,7 +68,10 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 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.response.order.BaseOrderResponse;
+import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
+import com.freemud.sdk.api.assortment.order.response.order.QueryRelatedOrderByCodeResp;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
 import com.google.common.base.Throwables;
@@ -84,9 +84,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import cn.freemud.management.entities.dto.request.pay.OrderRefundRequest;
-import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
-
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -139,10 +136,6 @@ public class MallOrderServiceImpl implements MallOrderService {
     @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
 
-//    @Value("${program.backorders_change_order_status_consumer_queue}")
-//    private String backOrdersChangeOrderStatusConsumerQueue;
-//    @Value("${program.backorders_notify_activity_exchange}")
-//    private String backOrdersNotifyActivityExchange;
     @Autowired
     private CouponActivityService couponActivityService;
 
@@ -725,7 +718,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
             //调用支付退款
-            OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+            PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
             response = payServiceImpl.orderRefund(orderPayRefundRequest);
             if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");

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

@@ -45,7 +45,7 @@ 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.request.pay.PayRefundRequestDto;
 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;
@@ -2115,7 +2115,7 @@ public class OrderServiceImpl implements Orderservice {
                 state = PayRefundStatus.SUCCESS.getCode();
             } else {
                 //调用支付退款
-                OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+                PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
                 //抖音支付退款必传
                 orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
                 response = payServiceImpl.orderRefund(orderPayRefundRequest);
@@ -2827,7 +2827,7 @@ public class OrderServiceImpl implements Orderservice {
         SdkUpdateAbnormalState sdkUpdateAbnormalState = new SdkUpdateAbnormalState();
         String desc = "支付未及时回调";
 
-        OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
+        PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, orderBean.getOid());
         response = payServiceImpl.orderRefund(orderPayRefundRequest);
         if (response != null && noPay.equals(response.getCode())) {
             return;

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

@@ -21,7 +21,6 @@ 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.*;
@@ -827,7 +826,7 @@ public class PayServiceImpl {
     /**
      * 支付退款
      */
-    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(OrderRefundRequest orderPayRefundRequest) {
+    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(PayRefundRequestDto orderPayRefundRequest) {
         return orderRefundNew(orderPayRefundRequest);
     }
 
@@ -1278,7 +1277,7 @@ public class PayServiceImpl {
     /**
      * 退款从sdk 剥离
      */
-    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(OrderRefundRequest refundRequest) {
+    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(PayRefundRequestDto refundRequest) {
 
         PaymentQueryOrderRequestDto paymentQueryOrderRequest = new PaymentQueryOrderRequestDto();
 

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;
@@ -31,8 +30,8 @@ public class PaymentSdkAdapter {
     @Value("${saas.refund.notify.callback}")
     private String refundNotifyCallback;
 
-    public OrderRefundRequest getOrderRefundRequest(OrderBeanV1 orderBean, BigDecimal refundAmount) {
-        OrderRefundRequest refundRequestDTO = new OrderRefundRequest();
+    public PayRefundRequestDto getOrderRefundRequest(OrderBeanV1 orderBean, BigDecimal refundAmount) {
+        PayRefundRequestDto refundRequestDTO = new PayRefundRequestDto();
         refundRequestDTO.setPartnerId(orderBean.getCompanyId());
         refundRequestDTO.setStoreId(orderBean.getShopId());
         refundRequestDTO.setOrgTransId(orderBean.getOid());
@@ -42,7 +41,7 @@ public class PaymentSdkAdapter {
         refundRequestDTO.setAppId(orderExtInfoDto.getAppid());
         refundRequestDTO.setOrgPayFmId(orderBean.getPayVoucher());
         refundRequestDTO.setOpenid(orderExtInfoDto.getOpenid());
-        refundRequestDTO.setRefundId(getRefundSerialNo());
+        refundRequestDTO.setRefundId(getRefundSerialNo().toString());
         return refundRequestDTO;
     }
 

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;
+//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 openid;
-    private String businessDate;
-    private String refundDesc;
-    private String notifyUrl;
-    private String orgPayFmId;
-    private Long refundAmount;
-    private Long totalAmount;
-
-}
+//    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/request/pay/PayRefundRequestDto.java

@@ -73,4 +73,12 @@ public class PayRefundRequestDto {
      */
     private Map<String, String> extendParams;
 
+
+    private String appId;
+    private String payCode;
+    private String payTimeOutTime;
+    private String orgTransId;
+    private String openid;
+    private String orgPayFmId;
+
 }

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

@@ -2,7 +2,6 @@ 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.*;
@@ -89,7 +88,7 @@ public class PaymentHandle {
      */
     public PayRefundResponse refund(OrderManagerRequest request, OrderBeanV1 orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
-        OrderRefundRequest orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean,getRefundAmount(orderBean));
+        PayRefundRequestDto orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean,getRefundAmount(orderBean));
         //抖音支付必传
         orderRefundRequest.setRefundDesc(request.getReason() == null? "商家退款" : request.getReason());
         if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
@@ -155,7 +154,7 @@ public class PaymentHandle {
      */
     public PayRefundResponse mcCafeRefund(OrderManagerRequest request, OrderBeanV1 orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
-        OrderRefundRequest orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean, new BigDecimal(orderBean.getAmount()));
+        PayRefundRequestDto orderRefundRequest = paymentSdkAdapter.getOrderRefundRequest(orderBean, new BigDecimal(orderBean.getAmount()));
         if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
             return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
         }
@@ -227,7 +226,7 @@ public class PaymentHandle {
     }
 
 
-    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(OrderRefundRequest refundRequest) {
+    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(PayRefundRequestDto refundRequest) {
 
         PaymentQueryOrderRequestDto paymentQueryOrderRequest = new PaymentQueryOrderRequestDto();