Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

产品购买记录结束时间缺失补充

Browse Source
This commit is contained in:
gaoqr
2025-08-26 16:51:16 +08:00
parent f7a06a24e6
commit bef0201dcf
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/pay/PayController.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class PayController {
@RequestParam(required = false) Map<String, String> params, @RequestParam(required = false) Map<String, String> params,
@RequestBody(required = false) String body, @RequestBody(required = false) String body,
@RequestHeader Map<String, String> headers) { @RequestHeader Map<String, String> headers) {
log.info("[notifyOrder][channelCode({}) 回调数据({}/{}/{})]", channelCode, params, body, headers); log.debug("[notifyOrder][channelCode({}) 回调数据({}/{}/{})]", channelCode, params, body, headers);
payOrderService.doOrderNotify(channelCode, params, body, headers); payOrderService.doOrderNotify(channelCode, params, body, headers);
// 支付接口回调相应必须是"success" // 支付接口回调相应必须是"success"
return "success"; return "success";
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+2 -2
View File
@@ -600,13 +600,13 @@ public class PayOrderServiceImpl implements PayOrderService {
} }
/** /**
* 充值成功回调 * 充值失败回调
* *
* @param payOrderDO * @param payOrderDO
* @param organId * @param organId
*/ */
private void notifyRechargeOrderFail(PayOrderDO payOrderDO, Long organId) { private void notifyRechargeOrderFail(PayOrderDO payOrderDO, Long organId) {
// todo 充值成功回调 // todo 充值失败回调
} }
/** /**
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayProductProcessor.java
+12
View File
@@ -302,6 +302,9 @@ public class PayProductProcessor {
.totalAmount(price) .totalAmount(price)
.isInvocing(InvoiceStatusEnum.INVOICABLE.getStatus()) .isInvocing(InvoiceStatusEnum.INVOICABLE.getStatus())
.build(); .build();
purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
// 先用赠送金 // 先用赠送金
if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) { if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) {
@@ -369,6 +372,9 @@ public class PayProductProcessor {
.paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_WECHAT.getCode()) .paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.BALANCE_AND_GIFT_AND_WECHAT.getCode())
.totalAmount(price) .totalAmount(price)
.build(); .build();
purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
// 先用余额 // 先用余额
if (balance != null && balance.compareTo(BigDecimal.ZERO) > 0) { if (balance != null && balance.compareTo(BigDecimal.ZERO) > 0) {
@@ -435,6 +441,9 @@ public class PayProductProcessor {
.paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.GIFT_AND_WECHAT.getCode()) .paymentMethod(payChannelCodeEnum.ALIPAY_PC.equals(payChannelCodeEnum) ? PayProductChannelCodeEnum.GIFT_AND_ALIPAY.getCode() : PayProductChannelCodeEnum.GIFT_AND_WECHAT.getCode())
.totalAmount(price) .totalAmount(price)
.build(); .build();
purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
// 先用余额 // 先用余额
@@ -504,6 +513,9 @@ public class PayProductProcessor {
.paymentMethod(PayProductChannelCodeEnum.BALANCE_AND_GIFT.getCode()) .paymentMethod(PayProductChannelCodeEnum.BALANCE_AND_GIFT.getCode())
.totalAmount(price) .totalAmount(price)
.build(); .build();
purchaseRecordDO.setEndTime(calculateEndTime(purchaseRecordDO.getStartTime(),
purchaseRecordDO.getPurchaseDuration(), purchaseRecordDO.getPurchaseDurationUnit(),
purchaseRecordDO.getGiftDuration(), purchaseRecordDO.getGiftDurationUnit()));
// 先用赠送金 // 先用赠送金
if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) { if (gift != null && gift.compareTo(BigDecimal.ZERO) > 0) {