【同步】对齐 boot 和 cloud 的逻辑
This commit is contained in:
parent
d00bd2e2ec
commit
6f997ef1e6
@ -1,48 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.pay.controller.admin.transfer.vo;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import lombok.ToString;
|
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
|
|
||||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
|
||||||
|
|
||||||
@Schema(description = "管理后台 - 转账单分页 Request VO")
|
|
||||||
@Data
|
|
||||||
@EqualsAndHashCode(callSuper = true)
|
|
||||||
@ToString(callSuper = true)
|
|
||||||
public class PayTransferPageReqVO extends PageParam {
|
|
||||||
|
|
||||||
@Schema(description = "转账单号")
|
|
||||||
private String no;
|
|
||||||
|
|
||||||
@Schema(description = "应用编号", example = "12831")
|
|
||||||
private Long appId;
|
|
||||||
|
|
||||||
@Schema(description = "渠道编码", example = "wx_app")
|
|
||||||
private String channelCode;
|
|
||||||
|
|
||||||
@Schema(description = "商户转账单编号", example = "17481")
|
|
||||||
private String merchantTransferId;
|
|
||||||
|
|
||||||
@Schema(description = "类型", example = "2")
|
|
||||||
private Integer type;
|
|
||||||
|
|
||||||
@Schema(description = "转账状态", example = "2")
|
|
||||||
private Integer status;
|
|
||||||
|
|
||||||
@Schema(description = "收款人姓名", example = "王五")
|
|
||||||
private String userName;
|
|
||||||
|
|
||||||
@Schema(description = "渠道转账单号")
|
|
||||||
private String channelTransferNo;
|
|
||||||
|
|
||||||
@Schema(description = "创建时间")
|
|
||||||
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
|
||||||
private LocalDateTime[] createTime;
|
|
||||||
|
|
||||||
}
|
|
@ -1,62 +0,0 @@
|
|||||||
package cn.iocoder.yudao.framework.pay.core.client.impl.weixin;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
|
|
||||||
import cn.iocoder.yudao.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
|
|
||||||
import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
|
|
||||||
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
|
|
||||||
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
|
|
||||||
import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
|
|
||||||
import com.github.binarywang.wxpay.constant.WxPayConstants;
|
|
||||||
import com.github.binarywang.wxpay.exception.WxPayException;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 微信支付(H5 网页)的 PayClient 实现类
|
|
||||||
*
|
|
||||||
* 文档:<a href="https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_3_1.shtml">H5下单API</>
|
|
||||||
*
|
|
||||||
* @author YYQ
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public class WxWapPayClient extends AbstractWxPayClient {
|
|
||||||
|
|
||||||
public WxWapPayClient(Long channelId, WxPayClientConfig config) {
|
|
||||||
super(channelId, PayChannelEnum.WX_WAP.getCode(), config);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected WxWapPayClient(Long channelId, String channelCode, WxPayClientConfig config) {
|
|
||||||
super(channelId, channelCode, config);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void doInit() {
|
|
||||||
super.doInit(WxPayConstants.TradeType.MWEB);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected PayOrderRespDTO doUnifiedOrderV2(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
|
|
||||||
// 构建 WxPayUnifiedOrderRequest 对象
|
|
||||||
WxPayUnifiedOrderRequest request = buildPayUnifiedOrderRequestV2(reqDTO);
|
|
||||||
// 执行请求
|
|
||||||
WxPayMwebOrderResult response = client.createOrder(request);
|
|
||||||
|
|
||||||
// 转换结果
|
|
||||||
return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.URL.getMode(), response.getMwebUrl(),
|
|
||||||
reqDTO.getOutTradeNo(), response);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected PayOrderRespDTO doUnifiedOrderV3(PayOrderUnifiedReqDTO reqDTO) throws WxPayException {
|
|
||||||
// 构建 WxPayUnifiedOrderRequest 对象
|
|
||||||
WxPayUnifiedOrderV3Request request = buildPayUnifiedOrderRequestV3(reqDTO);
|
|
||||||
// 执行请求
|
|
||||||
String response = client.createOrderV3(TradeTypeEnum.H5, request);
|
|
||||||
|
|
||||||
// 转换结果
|
|
||||||
return PayOrderRespDTO.waitingOf(PayOrderDisplayModeEnum.URL.getMode(), response,
|
|
||||||
reqDTO.getOutTradeNo(), response);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user