Commit a903b431 by ping.wu

Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'qa' of…

Merge branches 'feature/20211125_退款回掉取消订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
parents 01a2ae61 2b7d9032
......@@ -1348,6 +1348,7 @@ public class PayServiceImpl {
if(refundNewResponse == null){
return null;
}
AppLogUtil.infoLog("paymentcenter/refund",JSONObject.toJSONString(request),JSONObject.toJSONString(refundNewResponse));
if (Objects.equals(refundNewResponse.getCode(), "100")) {
PayRefundData refundData = refundNewResponse.getData();
if (null != refundData ) {
......
......@@ -12,6 +12,7 @@ import cn.freemud.management.thirdparty.MulitiPaymentClient;
import cn.freemud.management.thirdparty.OMSPaymentClient;
import cn.freemud.management.util.RedisUtil;
import cn.freemud.redis.RedisCache;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappStore;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIappWxappStoreManager;
import com.freemud.application.sdk.api.base.BaseResponse;
......@@ -21,6 +22,7 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
import com.freemud.application.sdk.api.util.ResponseUtils;
import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
......@@ -78,6 +80,8 @@ public class PaymentHandle {
@Autowired
private AssortmentOpenPlatformIappWxappStoreManager assortmentOpenPlatformIappWxappStoreManager;
@Autowired
private LogUtil logUtil;
/**
* 退款
......@@ -297,6 +301,7 @@ public class PaymentHandle {
if(refundNewResponse == null){
return null;
}
logUtil.info("paymentcenter/refund", JSONObject.toJSONString(request),JSONObject.toJSONString(refundNewResponse));
if (Objects.equals(refundNewResponse.getCode(), "100")) {
PayRefundData refundData = refundNewResponse.getData();
if (null != refundData) {
......
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