去除支付sdk,换成Feign调用

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PayRefundData {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String thirdPartTradeNo;
+    private String tradeNo;
+    private String refundTradeNo;
+    private String thirdPartRefundTradeNo;
+    private Long refundAmount;
+    private Long totalAmount;
+    private Integer refundStatus;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class PayRefundRequestDto {
+
+    /**
+     * 接口版本，必须为2
+     */
+    private Integer ver;
+    /**
+     * 商户编号（由非码提供）
+     */
+    private String partnerId;
+    /**
+     * 退款交易序号
+     */
+    private String refundId;
+    /**
+     * 营业员编号（可以使用固定值）
+     */
+    private String operatorId;
+    /**
+     * 商家POS机编号（可以使用固定值）
+     */
+    private String stationId;
+    /**
+     * 商家门店号（在线支付需要提前定义）
+     */
+    private String storeId;
+    /**
+     * 终端交易序号
+     */
+    private String transId;
+    /**
+     * 业务日期
+     */
+    private String businessDate;
+    /**
+     * 客户端code
+     */
+    private Long clientCode;
+    /**
+     * 非码交易流水号
+     */
+    private String fmId;
+    /**
+     * 总金额
+     */
+    private Long totalAmount;
+    /**
+     * 退款金额
+     */
+    private Long refundAmount;
+    /**
+     * 退款原因描述
+     */
+    private String refundDesc;
+    /**
+     * 退款回调地址
+     */
+    private String notifyUrl;
+    /**
+     * 退款时分账规则
+     */
+    private String accountDivided;
+
+    /**
+     * 扩展字段，存放扩展信息
+     */
+    private Map<String, String> extendParams;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PayRefundResponseDto {
+
+    private Integer code;
+    private String message;
+    private PayRefundData data;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryOrderRequestDto {
+
+    private String transactionCode;
+    private String ver;
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String businessDate;
+    private String clientCode;
+    private String fmId;
+    private String thirdPartTradeNo;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryOrderResponseDto {
+
+    private String userId;
+    private Integer merchantCoupon;
+    private Integer platformCoupon;
+    private Integer vipAmount;
+    private Long amount;
+    private String transactionCode;
+    private String status;
+    private String payCode;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryRequestDto {
+
+    private String transactionCode;
+    private String ver;
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String businessDate;
+    private String clientCode;
+    private String fmId;
+    private String thirdPartTradeNo;
+    private String endTransId;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PaymentQueryResponseDto {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String userId;
+    private String transCurrency;
+    private Integer totalAmount;
+    private Integer merchantCoupon;
+    private Integer platformCoupon;
+    private String tradeNo;
+    private String thirdPartTradeNo;
+    private String tradeTime;
+    private String tradeState;
+    private String platformMchId;
+    private String appId;
+    private String endTransId;
+
+}

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

@@ -10,6 +10,8 @@ import cn.freemud.entities.dto.coupon.InvalidCouponsRequestDto;
 import cn.freemud.entities.dto.coupon.InvalidCouponsResponseDto;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
+import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
+import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.StoreMixResponseDto;
@@ -21,8 +23,8 @@ import cn.freemud.enums.TradeState;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.AppOrderService;
-import cn.freemud.service.StoreService;
 import cn.freemud.service.thirdparty.CouponOnlineClient;
+import cn.freemud.service.thirdparty.PaymentNewClient;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.RedisUtil;
 import cn.freemud.utils.ResponseUtil;
@@ -42,17 +44,11 @@ import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.domain.ProductInfosDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.GetProductRequest;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
-import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
-import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
-import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
@@ -87,8 +83,6 @@ public class AppOrderServiceImpl implements AppOrderService {
     @Autowired
     private OrderCenterSdkService orderCenterSdkService;
     @Autowired
-    private PaymentNewService paymentNewService;
-    @Autowired
     private RedisCache redisCache;
     @Autowired
     private RedisService redisService;
@@ -109,6 +103,9 @@ public class AppOrderServiceImpl implements AppOrderService {
     @Autowired
     private PayServiceImpl payServiceimpl;
 
+    @Autowired
+    private PaymentNewClient paymentNewClient;
+
     /**
      * 不支持会员卡
      */
@@ -332,12 +329,12 @@ public class AppOrderServiceImpl implements AppOrderService {
         if (extInfo != null && StringUtils.isNotEmpty(extInfo.getFmId())) {
             //订单状态未支付且存在预支付订单：
             // 1.查询预支付订单支付状态
-            PaymentQueryRequest paymentQueryRequest = new PaymentQueryRequest();
+            PaymentQueryRequestDto paymentQueryRequest = new PaymentQueryRequestDto();
             paymentQueryRequest.setPartnerId(orderBean.getCompanyId());
             paymentQueryRequest.setStoreId(orderBean.getShopId());
             paymentQueryRequest.setFmId(extInfo.getFmId());
             paymentQueryRequest.setVer("2");
-            com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponse> queryResponseBaseResponse = paymentNewService.query(paymentQueryRequest, LogThreadLocal.getTrackingNo());
+            com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> queryResponseBaseResponse = paymentNewClient.payQuery(paymentQueryRequest);
             //判断预支付订单状态
             if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), queryResponseBaseResponse.getCode())) {
                 throw new ServiceException(ResponseResult.ORDER_PAY_GETPRE_MESSAGE_ERROR);
@@ -353,7 +350,7 @@ public class AppOrderServiceImpl implements AppOrderService {
                 closeUnifiedOrderRequest.setVer("2");
                 closeUnifiedOrderRequest.setPartnerId(orderBean.getCompanyId());
                 closeUnifiedOrderRequest.setStoreId(orderBean.getShopId());
-                com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = paymentNewService.cancelNewUnifiedOrder(closeUnifiedOrderRequest, LogThreadLocal.getTrackingNo());
+                com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = paymentNewClient.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
                 if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), cancelNewUnifiedOrder.getCode())) {
                     throw new ServiceException(ResponseResult.ORDER_PRE_PAYMENT_CLOSE_FAILED);
                 }

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

@@ -33,10 +33,6 @@ import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
 import cn.freemud.entities.dto.user.GetSvcInfoByMemberIdResponseVo;
 import cn.freemud.entities.dto.user.StatisticalScoreRequestVo;
 import cn.freemud.entities.vo.*;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.GetMemberCouponRequestVo;
-import cn.freemud.entities.vo.SellCouponCreateOrderVo;
-import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.entities.vo.order.CreateOrderCouponCodeVo;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
@@ -61,10 +57,9 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
-import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
-import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;

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

@@ -7,12 +7,10 @@ import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.UpdateReserveOrderResponseVo;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.pay.PaymentQueryRequestDto;
+import cn.freemud.entities.dto.pay.PaymentQueryResponseDto;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto;
 import cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto;
-import cn.freemud.entities.dto.GetShopDishWareProductDto;
-import cn.freemud.entities.dto.ProductListDto;
-import cn.freemud.entities.dto.ShopBaseResponseDto;
-import cn.freemud.entities.dto.ShoppingCartBaseResponse;
 import cn.freemud.entities.dto.promotion.CouponPromotionDto;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
@@ -28,6 +26,7 @@ import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.EncircleOrderService;
+import cn.freemud.service.thirdparty.PaymentNewClient;
 import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.service.thirdparty.SvcAppClient;
@@ -48,15 +47,9 @@ import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.storecenter.request.GetStoreTableRequest;
 import com.freemud.application.sdk.api.storecenter.response.GetStoreTableResponse;
-import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
@@ -107,8 +100,6 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
     @Autowired
     private OrderAdapter orderAdapter;
     @Autowired
-    private PaymentNewService paymentNewService;
-    @Autowired
     private SvcAppClient svcAppClient;
     @Autowired
     private OrderCommonService orderCommonService;
@@ -124,6 +115,8 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
     private CouponAdapter couponAdapter;
     @Autowired
     private PayServiceImpl payService;
+    @Autowired
+    private PaymentNewClient paymentNewClient;
 
     private final Integer RESPONSE_SUCCESS_CODE = 100;
 
@@ -575,12 +568,12 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
             if(extInfo != null && StringUtils.isNotEmpty(extInfo.getPrePayTransId()) && StringUtils.isNotEmpty(extInfo.getFmId())){
                 //订单状态未支付且存在预支付订单：
                 // 1.查询预支付订单支付状态
-                PaymentQueryRequest paymentQueryRequest = new PaymentQueryRequest();
+                PaymentQueryRequestDto paymentQueryRequest = new PaymentQueryRequestDto();
                 paymentQueryRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
                 paymentQueryRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
                 paymentQueryRequest.setFmId(extInfo.getFmId());
                 paymentQueryRequest.setVer("2");
-                com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponse> queryResponseBaseResponse =  paymentNewService.query(paymentQueryRequest,LogThreadLocal.getTrackingNo());
+                com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> queryResponseBaseResponse = paymentNewClient.payQuery(paymentQueryRequest);
                 //判断预支付订单状态
                 if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),queryResponseBaseResponse.getCode())){
                     return ResponseUtil.error(ResponseResultEnum.PAY_BACKEND_QUERY_DETAIL_ERROR.getCode(),ResponseResultEnum.PAY_BACKEND_QUERY_DETAIL_ERROR.getMessage(),null);
@@ -596,7 +589,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
                     closeUnifiedOrderRequest.setVer("2");
                     closeUnifiedOrderRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
                     closeUnifiedOrderRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
-                    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = paymentNewService.cancelNewUnifiedOrder(closeUnifiedOrderRequest,LogThreadLocal.getTrackingNo());
+                    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder = paymentNewClient.cancelNewUnifiedOrder(closeUnifiedOrderRequest);
                     if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),cancelNewUnifiedOrder.getCode())){
                         return ResponseUtil.error(ResponseResult.ENCIRCLEORDER_PRE_PAYMENT_CLOSE_FAILED);
                     }

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

@@ -26,13 +26,13 @@ import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.db.PushMccafeOrder;
-import cn.freemud.entities.dto.order.McCafePushOrderDto;
 import cn.freemud.entities.dto.MCCafeDeliveryBaseResponse;
 import cn.freemud.entities.dto.PayAccessResponse;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.delivery.*;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
+import cn.freemud.entities.dto.order.McCafePushOrderDto;
 import cn.freemud.entities.dto.pay.OrderPayResponse;
 import cn.freemud.entities.dto.pay.PaymentMqMessageDto;
 import cn.freemud.entities.dto.product.AttributeValue;
@@ -48,8 +48,8 @@ import cn.freemud.entities.dto.user.SendCouponForqujiaRequestDto;
 import cn.freemud.entities.vo.CreateDeliveryVo;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.mccafe.RecentGoodsInfoVo;
-import cn.freemud.enums.*;
 import cn.freemud.enums.OrderType;
+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;
@@ -79,35 +79,25 @@ import com.freemud.application.sdk.api.couponcenter.offline.response.CouponBaseR
 import com.freemud.application.sdk.api.couponcenter.offline.response.CouponRedeemResponse;
 import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrderResponseDto;
 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.entities.v1.ProductBeanV1;
-import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
-import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
-import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
+import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.request.*;
-import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
-import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
+import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
-import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
-import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
-import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.GetListByCodesResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
-import com.freemud.application.sdk.api.util.Md5Util;
 import com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig;
 import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
 import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsgDataValue;
@@ -121,9 +111,6 @@ import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
 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.payment.OrderPayResponse;
-import cn.freemud.service.mccafe.CouponClientService;
-import cn.freemud.service.mccafe.MCCafeOrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
@@ -132,8 +119,6 @@ import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundQueryResponse;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
-import com.freemud.sdk.api.assortment.payment.service.PaymentCenterService;
-import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
 import com.freemud.sdk.api.assortment.payment.service.process.NewPaymentCenterServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -144,7 +129,6 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.client.HttpClient;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -156,15 +140,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+
 @Service
 public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
@@ -255,8 +236,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     @Autowired
     private PaymentQueueService paymentQueueService;
     @Autowired
-    private PaymentNewService paymentNewService;
-    @Autowired
     private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
     @Autowired
     private OrderAdapterServiceImpl orderAdapterService;
@@ -296,6 +275,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     @Autowired
     private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
 
+
+    @Autowired
+    private PayServiceImpl payServiceImpl;
+
     private static MapperFacade mapper = new DefaultMapperFactory.Builder().build().getMapperFacade();
     /**
      * 下单检查key，防止重复下单
@@ -676,7 +659,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if (totalAmount > 0) {
-            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, createPrepayRequestDto.getNeedInvoice());
+            orderPayResponse = payServiceImpl.getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, createPrepayRequestDto.getCardAmount(), transId, null);
+//            orderPayResponse = getPreOrderPay(createPrepayRequestDto.getFatherOrderBean(), paymentRequest, LogThreadLocal.getTrackingNo(), createPrepayRequestDto.getCardAmount(), transId, createPrepayRequestDto.getNeedInvoice());
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, createPrepayRequestDto.getFatherOrderBean());

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

@@ -306,7 +306,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if(totalAmount > 0) {
-            orderPayResponse = getPreOrderPay(orderBean, paymentRequest, LogThreadLocal.getTrackingNo(), 0);
+            orderPayResponse = payServiceImpl.getPreOrderPay(orderBean, paymentRequest,  0,orderBean.getOid(),orderExtInfoDTO);
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = getOrderPayResponse(paymentRequest, orderBean);

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java

@@ -5,9 +5,10 @@ import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.order.FacePayRequestDto;
 import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.order.InvoiceCreateResponse;
-import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
-import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
+import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.order.RefundQueryResponseDto;
+import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
+import com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -64,4 +65,20 @@ public interface PaymentNewClient {
     com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> codePay(@RequestBody FacePayRequestDto orderPayDto);
 
 
+    @LogIgnoreFeign(logMessage="payQuery")
+    @PostMapping("paymentcenter/close")
+    com.freemud.application.sdk.api.base.BaseResponse<PaymentCloseUnifiedOrderResponse> cancelNewUnifiedOrder(@RequestBody PaymentCloseUnifiedOrderRequest request);
+
+    @LogIgnoreFeign(logMessage="payQuery")
+    @PostMapping("paymentcenter/query")
+    com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> payQuery(@RequestBody PaymentQueryRequestDto request);
+
+    @LogIgnoreFeign(logMessage="payQueryOrder")
+    @PostMapping("paymentcenter/queryOrder")
+    com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrder(@RequestBody PaymentQueryOrderRequestDto request);
+
+    //现金支付退款接口
+    @LogIgnoreFeign(logMessage="payRefund")
+    @PostMapping("paymentcenter/refund")
+    com.freemud.application.sdk.api.base.BaseResponse<PayRefundResponseDto> payRefund(@RequestBody PayRefundRequestDto request);
 }

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

@@ -252,7 +252,8 @@ public class SaasMallOrderService extends UniversalOrderService {
         if (totalAmount < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
         } else if (totalAmount > 0) {
-            orderPayResponse = this.getPreOrderPay(orderBean, paymentRequest, LogThreadLocal.getTrackingNo(), 0);
+            orderPayResponse = payService.getPreOrderPay(orderBean, paymentRequest,  0,orderBean.getOid(),null);
+//            orderPayResponse = this.getPreOrderPay(orderBean, paymentRequest, LogThreadLocal.getTrackingNo(), 0);
         } else {
             // 0元订单如果不需要支付，自定义支付单号
             orderPayResponse = super.getOrderPayResponse(paymentRequest, orderBean);