From 8a467f4b887967382c6bb7e15d0d61e382e4f1c3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 07 Feb 2025 17:38:46 +0800
Subject: [PATCH] refactor(pay): 重构 FIUU 支付接口并创建专用的回调控制器
---
src/main/resources/mapper/modules/MallGoodsMapper.xml | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index 1cb7ecf..4bf2c36 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -29,6 +29,7 @@
<result property="levelOnePrice" column="level_one_price" />
<result property="levelTwoPrice" column="level_two_price" />
<result property="levelThreePrice" column="level_three_price" />
+ <result property="hasCollect" column="hasCollect" />
<collection property="styles" ofType="cc.mrbird.febs.mall.entity.MallGoodsStyle">
<id property="id" column="style_id" />
<result property="name" column="style_name" />
@@ -55,6 +56,7 @@
<select id="selectGoodsDetailById" resultMap="MallGoodsMap">
select
a.*,
+ case when collection.id is null then 2 else 1 end hasCollect,
b.id style_id,
b.name style_name,
b.goods_id style_goods_id,
@@ -75,6 +77,7 @@
from mall_goods a
left join mall_goods_style b on a.id = b.goods_id
left join mall_goods_sku c on b.id=c.style_id
+ left join mall_member_collection collection on a.id=collection.goods_id
where a.id=#{id}
</select>
@@ -83,28 +86,26 @@
select
a.id,
a.goods_name,
- a.goods_introdution goodsIntroduction,
a.thumb,
a.unit,
a.original_price,
a.present_price,
- a.level_one_price,
- a.level_two_price,
- a.level_three_price,
a.score,
a.is_hot,
- a.carriage_type,
- a.carriage_amount,
- a.carriage_rule_id,
- a.goods_weight,
a.order_number,
+ <if test="record.memberId != null">
+ case when collection.id is null then 2 else 1 end hasCollect,
+ </if>
min(b.id) skuId,
min(b.present_price) price,
- sum(b.stock) stock,
+ ifnull(sum(b.stock), a.stock) stock,
sum(b.sku_volume) saleVolume
from mall_goods a
left join mall_goods_sku b on a.id=b.goods_id
left join mall_goods_category c on a.category_id=c.id
+ <if test="record.memberId != null">
+ left join mall_member_collection collection on a.id=collection.goods_id and collection.member_id=#{record.memberId}
+ </if>
<where>
a.is_sale=1
<if test="record != null">
@@ -114,8 +115,14 @@
<if test="record.isNormal != null and record.isNormal != ''">
and a.is_normal = #{record.isNormal}
</if>
- <if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
+ <if test="record.isNormal == 3">
+ and a.activity_id = #{record.activityId}
+ </if>
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 1">
and a.goods_type = #{record.goodsType} and a.present_price != 0
+ </if>
+ <if test="record.goodsType != null and record.goodsType != '' and record.goodsType == 2">
+ and a.goods_type = #{record.goodsType}
</if>
<if test="record.goodsType == 3">
and a.present_price = 0
@@ -161,6 +168,7 @@
a.goods_introdution,
a.unit,
a.thumb,
+ a.is_sku,
a.goods_details,
a.is_sale,
a.original_price,
@@ -181,6 +189,9 @@
</if>
<if test="record.goodsType != null and record.goodsType != ''">
and a.goods_type=#{record.goodsType}
+ </if>
+ <if test="record.activityId != null">
+ and a.activity_id=#{record.activityId}
</if>
</if>
</where>
@@ -324,16 +335,12 @@
select
a.id,
a.goods_name,
- a.goods_introdution goodsIntroduction,
a.thumb,
a.unit,
a.original_price,
a.present_price,
a.score,
a.is_hot,
- a.carriage_type,
- a.carriage_amount,
- a.carriage_rule_id,
a.goods_weight,
a.order_number,
min(b.id) skuId,
@@ -352,6 +359,9 @@
<if test="record.isNormal != null and record.isNormal != ''">
and a.is_normal = #{record.isNormal}
</if>
+ <if test="record.isNormal == 3">
+ and a.activity_id = #{record.activityId}
+ </if>
<if test="record.goodsType != null and record.goodsType != '' and record.goodsType != 3">
and a.goods_type = #{record.goodsType} and a.present_price != 0
</if>
--
Gitblit v1.9.1