mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 05:42:06 +08:00
1、支付单位元换算为分错误处理;2、统一支付handler的dto区分于原框架独立;
This commit is contained in:
+107
@@ -0,0 +1,107 @@
|
|||||||
|
package com.cf.imes.module.system.controller.admin.pay.vo;
|
||||||
|
|
||||||
|
import com.cf.imes.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import jakarta.validation.constraints.DecimalMax;
|
||||||
|
import jakarta.validation.constraints.DecimalMin;
|
||||||
|
import jakarta.validation.constraints.Digits;
|
||||||
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.hibernate.validator.constraints.Length;
|
||||||
|
import org.hibernate.validator.constraints.URL;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 统一下单 Request DTO
|
||||||
|
*
|
||||||
|
* @author 晨丰科技
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class PayOrderUnifiedReqDTO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户 IP
|
||||||
|
*/
|
||||||
|
@NotEmpty(message = "用户 IP 不能为空")
|
||||||
|
private String userIp;
|
||||||
|
|
||||||
|
// ========== 商户相关字段 ==========
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 外部订单号
|
||||||
|
*
|
||||||
|
* 对应 PayOrderExtensionDO 的 no 字段
|
||||||
|
*/
|
||||||
|
@NotEmpty(message = "外部订单编号不能为空")
|
||||||
|
private String outTradeNo;
|
||||||
|
/**
|
||||||
|
* 商品标题
|
||||||
|
*/
|
||||||
|
@NotEmpty(message = "商品标题不能为空")
|
||||||
|
@Length(max = 32, message = "商品标题不能超过 32")
|
||||||
|
private String subject;
|
||||||
|
/**
|
||||||
|
* 商品描述信息
|
||||||
|
*/
|
||||||
|
@Length(max = 128, message = "商品描述信息长度不能超过128")
|
||||||
|
private String body;
|
||||||
|
/**
|
||||||
|
* 支付结果的 notify 回调地址
|
||||||
|
*/
|
||||||
|
@NotEmpty(message = "支付结果的回调地址不能为空")
|
||||||
|
@URL(message = "支付结果的 notify 回调地址必须是 URL 格式")
|
||||||
|
private String notifyUrl;
|
||||||
|
/**
|
||||||
|
* 支付结果的 return 回调地址
|
||||||
|
*/
|
||||||
|
@URL(message = "支付结果的 return 回调地址必须是 URL 格式")
|
||||||
|
private String returnUrl;
|
||||||
|
|
||||||
|
// ========== 订单相关字段 ==========
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 支付金额,单位:元
|
||||||
|
*/
|
||||||
|
@NotNull(message = "支付金额不能为空")
|
||||||
|
@DecimalMin(value = "0.01", message = "支付金额必须大于零")
|
||||||
|
@DecimalMax(value = "100000", message = "支付金额不能超过十万")
|
||||||
|
@Digits(integer = 6, fraction = 2, message = "支付金额格式不正确")
|
||||||
|
private BigDecimal price;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 支付过期时间
|
||||||
|
*/
|
||||||
|
@NotNull(message = "支付过期时间不能为空")
|
||||||
|
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
|
||||||
|
private LocalDateTime expireTime;
|
||||||
|
|
||||||
|
// ========== 拓展参数 ==========
|
||||||
|
/**
|
||||||
|
* 支付渠道的额外参数
|
||||||
|
*
|
||||||
|
* 例如说,微信公众号需要传递 openid 参数
|
||||||
|
*/
|
||||||
|
private Map<String, String> channelExtras;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发起支付给支付方后,异步回调原封不动回到调用方
|
||||||
|
*/
|
||||||
|
private Map<String, Object> passbackParams;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 展示模式
|
||||||
|
*
|
||||||
|
* 如果不传递,则每个支付渠道使用默认的方式
|
||||||
|
*
|
||||||
|
* 枚举 {@link PayOrderDisplayModeEnum}
|
||||||
|
*/
|
||||||
|
private String displayMode;
|
||||||
|
|
||||||
|
}
|
||||||
+2
-2
@@ -18,7 +18,7 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder;
|
|||||||
import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
|
import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
|
||||||
import com.cf.imes.framework.pay.config.ChenfengPayConfig;
|
import com.cf.imes.framework.pay.config.ChenfengPayConfig;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
|
import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
|
||||||
import com.cf.imes.framework.common.exception.PayException;
|
import com.cf.imes.framework.common.exception.PayException;
|
||||||
import com.cf.imes.framework.pay.core.enums.order.PayOrderStatusRespEnum;
|
import com.cf.imes.framework.pay.core.enums.order.PayOrderStatusRespEnum;
|
||||||
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
|
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
|
||||||
@@ -341,7 +341,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|||||||
payOrderUnifiedReqDTO.setSubject(subject);
|
payOrderUnifiedReqDTO.setSubject(subject);
|
||||||
payOrderUnifiedReqDTO.setBody(subject);
|
payOrderUnifiedReqDTO.setBody(subject);
|
||||||
payOrderUnifiedReqDTO.setOutTradeNo(payOrderDO.getPayNo());
|
payOrderUnifiedReqDTO.setOutTradeNo(payOrderDO.getPayNo());
|
||||||
payOrderUnifiedReqDTO.setPrice(payOrderDO.getPrice().intValue());
|
payOrderUnifiedReqDTO.setPrice(payOrderDO.getPrice());
|
||||||
payOrderUnifiedReqDTO.setExpireTime(payOrderDO.getExpireTime());
|
payOrderUnifiedReqDTO.setExpireTime(payOrderDO.getExpireTime());
|
||||||
payOrderUnifiedReqDTO.setNotifyUrl(String.format(alipayConfig.getNotifyUrl(), payOrderDO.getChannelCode().getCode()));
|
payOrderUnifiedReqDTO.setNotifyUrl(String.format(alipayConfig.getNotifyUrl(), payOrderDO.getChannelCode().getCode()));
|
||||||
payOrderUnifiedReqDTO.setPassbackParams(passbackParams);
|
payOrderUnifiedReqDTO.setPassbackParams(passbackParams);
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package com.cf.imes.module.system.service.pay.factory.impl;
|
package com.cf.imes.module.system.service.pay.factory.impl;
|
||||||
|
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
|
import com.cf.imes.module.system.controller.admin.pay.vo.PayOrderUnifiedReqDTO;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@ import com.alipay.api.response.AlipayTradeQueryResponse;
|
|||||||
import com.cf.imes.framework.common.util.object.ObjectUtils;
|
import com.cf.imes.framework.common.util.object.ObjectUtils;
|
||||||
import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
|
import com.cf.imes.framework.pay.config.ChenfengAlipayConfig;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
|
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.framework.pay.core.enums.order.PayOrderStatusRespEnum;
|
||||||
import com.cf.imes.module.system.enums.pay.PayConstants;
|
import com.cf.imes.module.system.enums.pay.PayConstants;
|
||||||
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
||||||
|
|||||||
+3
-2
@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.cf.imes.framework.common.util.json.JsonUtils;
|
import com.cf.imes.framework.common.util.json.JsonUtils;
|
||||||
import com.cf.imes.framework.pay.config.ChenfengWechatPayConfig;
|
import com.cf.imes.framework.pay.config.ChenfengWechatPayConfig;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderRespDTO;
|
||||||
import com.cf.imes.framework.pay.core.client.dto.order.PayOrderUnifiedReqDTO;
|
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.framework.pay.core.enums.order.PayOrderDisplayModeEnum;
|
||||||
import com.cf.imes.module.system.enums.pay.PayOrderStatusEnum;
|
import com.cf.imes.module.system.enums.pay.PayOrderStatusEnum;
|
||||||
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
import com.cf.imes.module.system.service.pay.factory.impl.AbstractPayHandler;
|
||||||
@@ -22,6 +22,7 @@ import jakarta.annotation.Resource;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@@ -48,7 +49,7 @@ public class WechatNativePayHandler extends AbstractPayHandler {
|
|||||||
WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
|
WxPayUnifiedOrderV3Request request = new WxPayUnifiedOrderV3Request();
|
||||||
request.setOutTradeNo(reqDTO.getOutTradeNo());
|
request.setOutTradeNo(reqDTO.getOutTradeNo());
|
||||||
request.setDescription(reqDTO.getSubject());
|
request.setDescription(reqDTO.getSubject());
|
||||||
request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getPrice() * 100)); // 单位分
|
request.setAmount(new WxPayUnifiedOrderV3Request.Amount().setTotal(reqDTO.getPrice().multiply(new BigDecimal(100)).intValue())); // 单位分
|
||||||
request.setTimeExpire(formatDateV3(reqDTO.getExpireTime()));
|
request.setTimeExpire(formatDateV3(reqDTO.getExpireTime()));
|
||||||
request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(getClientIP()));
|
request.setSceneInfo(new WxPayUnifiedOrderV3Request.SceneInfo().setPayerClientIp(getClientIP()));
|
||||||
request.setNotifyUrl(reqDTO.getNotifyUrl());
|
request.setNotifyUrl(reqDTO.getNotifyUrl());
|
||||||
|
|||||||
Reference in New Issue
Block a user