mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-22 20:15:06 +08:00
@@ -1067,24 +1067,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
|
||||
* 订单退款处理逻辑
|
||||
*/
|
||||
private WechatPayRefundResponse refundForOrder(WeChatRefundDTO dto) {
|
||||
// 查到orderCode对应的支付订单
|
||||
// OrderBasicInfo orderInfo = this.getOrderInfoByOrderCode(dto.getOrderCode());
|
||||
// // 校验订单
|
||||
// if (Objects.isNull(orderInfo)) {
|
||||
// logger.warn("orderCode:{}, 订单退款处理逻辑, 查询订单为空!", dto.getOrderCode());
|
||||
// throw new BusinessException(ReturnCodeEnum.CODE_QUERY_ORDER_NULL_ERROR);
|
||||
// }
|
||||
// // 判断退款金额,不能大于支付金额
|
||||
// BigDecimal payAmount = orderInfo.getPayAmount();
|
||||
// // BigDecimal orderAmount = orderInfo.getOrderAmount();
|
||||
// // BigDecimal amountToBeRefunded = payAmount.subtract(orderAmount); // 可退金额
|
||||
// BigDecimal amountToBeRefunded = dto.getRefundAmount(); // 可退金额
|
||||
// logger.info("订单:{}, 支付金额:{}, 需退款金额:{}", dto.getOrderCode(), payAmount, amountToBeRefunded);
|
||||
// if (dto.getRefundAmount().compareTo(amountToBeRefunded) > 0) {
|
||||
// // 退款金额,大于可退金额 抛出异常
|
||||
// logger.warn("退款金额:{},大于可退金额{}, 抛出异常", dto.getRefundAmount(), amountToBeRefunded);
|
||||
// throw new BusinessException(ReturnCodeEnum.CODE_REFUND_ORDER_AMOUNT_ERROR);
|
||||
// }
|
||||
// 查出来原来的支付信息
|
||||
WxpayCallbackRecord record = wxpayCallbackRecordService.selectByOrderCode(dto.getOrderCode());
|
||||
if (Objects.isNull(record)) {
|
||||
|
||||
@@ -194,6 +194,7 @@ public class WechatPayServiceImpl implements WechatPayService {
|
||||
// 转换附属参数
|
||||
PaymentScenarioDTO paymentScenarioDTO = JSONObject.parseObject(attach, PaymentScenarioDTO.class);
|
||||
String type = paymentScenarioDTO.getType();
|
||||
//
|
||||
BigDecimal amount = new BigDecimal(wechatPayNotifyResource.getAmount().getTotal());
|
||||
if (StringUtils.equals(type, ScenarioEnum.ORDER.getValue())) {
|
||||
// 1-订单支付
|
||||
@@ -225,7 +226,7 @@ public class WechatPayServiceImpl implements WechatPayService {
|
||||
record.setAttach(wechatPayNotifyResource.getAttach());
|
||||
record.setSuccessTime(DateUtils.toLocalDateTime(wechatPayNotifyResource.getSuccess_time(), DateUtils.RFC3339));
|
||||
record.setPayerOpenId(wechatPayNotifyResource.getPayer().getOpenid());
|
||||
record.setPayerTotal(wechatPayNotifyResource.getAmount().getPayer_total());
|
||||
record.setPayerTotal(wechatPayNotifyResource.getAmount().getTotal());
|
||||
wxpayCallbackRecordService.insertSelective(record);
|
||||
}
|
||||
return resultMap;
|
||||
|
||||
Reference in New Issue
Block a user