mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
新增第三方支付接口返回信息带渠道编码
This commit is contained in:
+21
@@ -81,6 +81,11 @@ public class PayOrderRespDTO {
|
||||
*/
|
||||
private Map<String,Object> passbackParams;
|
||||
|
||||
/**
|
||||
* 支付渠道:0-支付宝、1-微信
|
||||
*/
|
||||
private Integer channelCode;
|
||||
|
||||
/**
|
||||
* 创建【WAITING】状态的订单返回
|
||||
*/
|
||||
@@ -96,6 +101,22 @@ public class PayOrderRespDTO {
|
||||
return respDTO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建【WAITING】状态的订单返回
|
||||
*/
|
||||
public static PayOrderRespDTO waitingOf(String displayMode, String displayContent,
|
||||
String outTradeNo, Object rawData, Integer channelCode) {
|
||||
PayOrderRespDTO respDTO = new PayOrderRespDTO();
|
||||
respDTO.status = PayOrderStatusRespEnum.WAITING.getStatus();
|
||||
respDTO.displayMode = displayMode;
|
||||
respDTO.displayContent = displayContent;
|
||||
// 相对通用的字段
|
||||
respDTO.outTradeNo = outTradeNo;
|
||||
respDTO.rawData = rawData;
|
||||
respDTO.channelCode = channelCode;
|
||||
return respDTO;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建【SUCCESS】状态的订单返回
|
||||
*/
|
||||
|
||||
+2
-1
@@ -20,6 +20,7 @@ import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
|
||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||
import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
|
||||
import com.cf.imes.framework.pay.core.enums.order.PayOrderStatusRespEnum;
|
||||
import com.cf.imes.module.system.enums.pay.PayChannelCodeEnum;
|
||||
import com.cf.imes.module.system.enums.pay.PayConstants;
|
||||
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -80,7 +81,7 @@ public class AlipayPcPayHandler extends AbstractPayHandler {
|
||||
outTradeNo, response);
|
||||
}
|
||||
return PayOrderRespDTO.waitingOf(null, response.getBody(),
|
||||
outTradeNo, response);
|
||||
outTradeNo, response, PayChannelCodeEnum.ALIPAY_PC.getCode());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@ import com.cf.imes.framework.pay.config.ChenfengWechatPayConfig;
|
||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||
import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
|
||||
import com.cf.imes.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
|
||||
import com.cf.imes.module.system.enums.pay.PayChannelCodeEnum;
|
||||
import com.cf.imes.module.system.enums.pay.PayOrderStatusEnum;
|
||||
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
||||
import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
|
||||
@@ -64,7 +65,7 @@ public class WechatNativePayHandler extends AbstractPayHandler {
|
||||
|
||||
// 转换结果
|
||||
return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.APP.getMode(), JsonUtils.toJsonString(response),
|
||||
reqDTO.getOutTradeNo(), response);
|
||||
reqDTO.getOutTradeNo(), response, PayChannelCodeEnum.WECHAT_NATIVE.getCode());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user