Skip to content

O
order-group
Commit c3628c61 by ping.wu
Options

支付退款接口分开到oms模块

parent caccbb3a
Showing with 145 additions and 142 deletions
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;
}
//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;
}
//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;
}
//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/service/impl/PayServiceImpl.java
......@@ -21,8 +21,14 @@ 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.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.PaymentQueryOrderResponseDto;
import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.thirdparty.ComPayClient;
import cn.freemud.service.thirdparty.PaymentNewClient;
......@@ -61,18 +67,12 @@ 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.biz.ReceiverBiz;
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.domain.AccountDivideVo;
import com.freemud.sdk.api.assortment.payment.enums.PayRuleIdEnum;
import com.freemud.sdk.api.assortment.payment.enums.PayRuleTypeEnum;
import com.freemud.sdk.api.assortment.payment.enums.PaymentRefundStatus;
import com.freemud.sdk.api.assortment.payment.enums.PlatformType;
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.freemud.sdk.api.assortment.payment.service.ReceiverService;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
......@@ -100,8 +100,11 @@ public class PayServiceImpl {
private SvcComPayClient svcComPayClient;
@Autowired
private MulitiPaymentClient mulitiPaymentClient;
//OMSPaymentClient与PaymentNewClient都是payment-center-api服务，接口不能重复
@Autowired
private PaymentNewClient paymentNewClient;
@Autowired
private OMSPaymentClient omsPaymentClient;
@Autowired
private AssortmentOpenPlatformWxappManager openPlatformWxappManager;
......@@ -822,7 +825,7 @@ public class PayServiceImpl {
/**
* 支付查询
*/
public com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> payQuery( PaymentQueryRequestDto request){
public com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryResponseDto> payQuery(PaymentQueryRequestDto request){
return paymentNewClient.payQuery(request);
}
......@@ -1288,7 +1291,7 @@ public class PayServiceImpl {
paymentQueryOrderRequest.setPartnerId(refundRequest.getPartnerId());
paymentQueryOrderRequest.setStoreId(refundRequest.getStoreId());
paymentQueryOrderRequest.setFrontTransId(refundRequest.getOrgTransId());
com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = paymentNewClient.payQueryOrder(paymentQueryOrderRequest);
com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = omsPaymentClient.payQueryOrder(paymentQueryOrderRequest);
Long vipAmount = 0L;
String payCode = null;
if (Objects.equals(payQueryOrderResponse.getCode(), "100") && payQueryOrderResponse.getData() != null) {
......@@ -1329,22 +1332,22 @@ public class PayServiceImpl {
// request.setAccountDivided(receiveJsonStr);
// }
com.freemud.application.sdk.api.base.BaseResponse<PayRefundResponseDto> refundNewResponse = paymentNewClient.payRefund(request);
com.freemud.application.sdk.api.base.BaseResponse<PayRefundResponseDto> refundNewResponse = omsPaymentClient.payRefund(request);
if (Objects.equals(refundNewResponse.getCode(), "100") || Objects.equals(refundNewResponse.getCode(), "101")) {
PayRefundResponseDto res = refundNewResponse.getData();
if (null != res && null != res.getData()) {
PayRefundData refunData = res.getData();
PayRefundData refundData = res.getData();
OrderRefundResponse refundResponse = new OrderRefundResponse();
refundResponse.setStatusCode(refunData.getResultCode());
refundResponse.setMsg(refunData.getResultMsg());
refundResponse.setRefundAmount(refunData.getRefundAmount());
refundResponse.setTotalAmount(refunData.getTotalAmount());
refundResponse.setRefundStatus(this.getRefundStatus(refunData.getResultCode()));
refundResponse.setRefundTradeNo(refunData.getRefundTradeNo());
refundResponse.setTradeNo(refunData.getRefundTradeNo());
refundResponse.setThirdPartRefundTradeNo(refunData.getThirdPartRefundTradeNo());
refundResponse.setThirdPartTradeNo(refunData.getThirdPartTradeNo());
refundResponse.setTotalAmount(refunData.getTotalAmount());
refundResponse.setStatusCode(refundData.getResultCode());
refundResponse.setMsg(refundData.getResultMsg());
refundResponse.setRefundAmount(refundData.getRefundAmount());
refundResponse.setTotalAmount(refundData.getTotalAmount());
refundResponse.setRefundStatus(this.getRefundStatus(refundData.getResultCode()));
refundResponse.setRefundTradeNo(refundData.getRefundTradeNo());
refundResponse.setTradeNo(refundData.getRefundTradeNo());
refundResponse.setThirdPartRefundTradeNo(refundData.getThirdPartRefundTradeNo());
refundResponse.setThirdPartTradeNo(refundData.getThirdPartTradeNo());
refundResponse.setTotalAmount(refundData.getTotalAmount());
return ResponseUtils.success(refundResponse);
}
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
......@@ -79,17 +79,17 @@ public interface PaymentNewClient {
@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="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);
// /**
// * 现金支付退款接口
// */
// @LogIgnoreFeign(logMessage="payRefund")
// @PostMapping("paymentcenter/refund")
// com.freemud.application.sdk.api.base.BaseResponse<PayRefundResponseDto> payRefund(@RequestBody PayRefundRequestDto request);
}
order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
......@@ -11,7 +11,7 @@ import cn.freemud.management.entities.dto.response.pay.PaymentQueryOrderResponse
import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.intercept.OrderServiceException;
import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.PaymentNewClient;
import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.management.util.RedisUtil;
import cn.freemud.redis.RedisCache;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
......@@ -78,7 +78,7 @@ public class PaymentHandle {
// private PaymentNewService paymentNewService;
@Autowired
private PaymentNewClient paymentNewClient;
private OMSPaymentClient paymentNewClient;
@Autowired
private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
......
order-management/src/main/java/cn/freemud/management/thirdparty/PaymentNewClient.java → order-management/src/main/java/cn/freemud/management/thirdparty/OMSPaymentClient.java
......@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: PaymentNewClient
* @Title: OMSPaymentClient
* @Package cn.freemud.service.thirdparty
* @Description:
* @author: ping1.wu
......@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
*/
@FeignClient(name = "payment-center-api",url="${payment.new.baseUrl:}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface PaymentNewClient {
public interface OMSPaymentClient {
/**
* 关闭预支付订单
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment