From b0cce5337128002901a9843d26afecfab685e835 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sat, 08 Feb 2025 14:20:34 +0800
Subject: [PATCH] refactor(pay): 重构支付回调逻辑并优化支付成功页面 - 重构 FiuuReturnController 中的支付回调逻辑 - 移除未使用的代码和注释 - 优化支付成功页面的 HTML 结构和样式 - 添加返回首页的按钮
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index 32b898a..81b862c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
@@ -64,7 +65,8 @@
if (mallGoodsByGoodsName > 0) {
return new FebsResponse().fail().message("商品名称不能重复");
}
- String goodsNo = addMallGoodsDto.getGoodsNo();
+ String goodsNo = MallUtils.getOrderNum("PT");
+ addMallGoodsDto.setGoodsNo(goodsNo);
if (StrUtil.isEmpty(goodsNo)) {
return new FebsResponse().fail().message("商品编号不能为空");
}
@@ -1017,6 +1019,8 @@
new LambdaQueryWrapper<MallGoods>()
.select(MallGoods::getId, MallGoods::getGoodsName)
.eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_ENABLE)
+ .eq(MallGoods::getGoodsType, MallGoods.ISSALE_STATUS_ENABLE)
+ .eq(MallGoods::getIsNormal, MallGoods.ISSALE_STATUS_ENABLE)
);
List<AdminMallGoodsCouponTreeListVo> objects = new ArrayList<>();
--
Gitblit v1.9.1