From e7eb029ec5bc6d1a2a088f3e9151316757e537d7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 10 Feb 2025 11:37:39 +0800
Subject: [PATCH] feat(pay): 添加 FIUU充值功能并优化支付流程 - 新增 FIUU 充值接口和相关请求模型 - 更新 FIUU 支付流程，支持订单和充值操作 - 优化 FIUU 回调处理，增加对充值订单的支持 - 调整订单状态更新逻辑，确保支付成功后正确更新
---
src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
index 4bb947e..ecc1d42 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -55,7 +55,7 @@
if(ObjectUtil.isNotEmpty(state)){
mallActivityLambdaQueryWrapper.eq(MallActivity::getState,state);
}
- mallActivityLambdaQueryWrapper.orderByAsc(MallActivity::getCreatedTime);
+ mallActivityLambdaQueryWrapper.orderByDesc(MallActivity::getCreatedTime);
Page<MallActivity> mallActivityPage = this.baseMapper.selectPage(page, mallActivityLambdaQueryWrapper);
return mallActivityPage;
}
@@ -147,7 +147,7 @@
private Long addGoodsEntity(MallActivity mallActivity,BigDecimal discountSize,MallGoods mallGoodsItem){
mallGoodsItem.setIsNormal(GoodsTypeEnum.HUO_DONG.getValue());
mallGoodsItem.setGoodsName(mallActivity.getName()+"-"+(StrUtil.isEmpty(mallGoodsItem.getGoodsName()) ? "":mallGoodsItem.getGoodsName()));
- mallGoodsItem.setGoodsNo(mallGoodsItem.getGoodsNo()+"-"+mallActivity.getCode());
+ mallGoodsItem.setGoodsNo("HD"+mallActivity.getId()+"-"+mallGoodsItem.getGoodsNo());
mallGoodsItem.setActivityId(mallActivity.getId());
BigDecimal presentPrice = new BigDecimal(mallGoodsItem.getPresentPrice()).multiply(discountSize).setScale(2, RoundingMode.DOWN);
mallGoodsItem.setPresentPrice(presentPrice.toString());
@@ -228,9 +228,11 @@
.eq(MallGoods::getActivityId, id)
);
if(CollUtil.isNotEmpty(mallGoods)){
- mallGoodsMapper.update(null,
+ MallGoods goods = new MallGoods();
+ goods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+ mallGoodsMapper.update(goods,
new LambdaQueryWrapper<MallGoods>()
- .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_DISABLED)
+ .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_ENABLE)
.eq(MallGoods::getActivityId, id)
);
}
--
Gitblit v1.9.1