CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
荒
2025-11-01 12:42:03 +08:00
parent f24cc851f0
commit b5f74c465d
6 changed files with 183 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/jarvis/mapper/GiftCouponMapper.java
View File

@@ -23,4 +23,14 @@ public interface GiftCouponMapper {
*/
GiftCoupon selectGiftCouponStatistics(GiftCoupon giftCoupon);
/**
* 新增礼金信息
*/
int insertGiftCoupon(GiftCoupon giftCoupon);
/**
* 根据礼金Key更新礼金信息
*/
int updateGiftCoupon(GiftCoupon giftCoupon);
}

9
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/IGiftCouponService.java
View File

@@ -23,4 +23,13 @@ public interface IGiftCouponService {
*/
GiftCoupon selectGiftCouponStatistics(GiftCoupon giftCoupon);
/**
* 新增礼金信息
*/
int insertGiftCoupon(GiftCoupon giftCoupon);
/**
* 更新礼金信息
*/
int updateGiftCoupon(GiftCoupon giftCoupon);
}

9
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/GiftCouponServiceImpl.java
View File

@@ -32,4 +32,13 @@ public class GiftCouponServiceImpl implements IGiftCouponService {
return giftCouponMapper.selectGiftCouponStatistics(giftCoupon);
}
@Override
public int insertGiftCoupon(GiftCoupon giftCoupon) {
return giftCouponMapper.insertGiftCoupon(giftCoupon);
}
@Override
public int updateGiftCoupon(GiftCoupon giftCoupon) {
return giftCouponMapper.updateGiftCoupon(giftCoupon);
}
}

93
ruoyi-system/src/main/resources/mapper/jarvis/GiftCouponMapper.xml
View File

@@ -23,26 +23,27 @@
MAX(sku_id) as sku_id,
MAX(sku_name) as sku_name,
MAX(owner) as owner,
COUNT(DISTINCT order_id) as use_count,
SUM(gift_coupon_ocs_amount) as total_ocs_amount,
MIN(order_time) as create_time,
COALESCE(SUM(use_count), 0) as use_count,
COALESCE(SUM(total_ocs_amount), 0) as total_ocs_amount,
MIN(create_time) as create_time,
MAX(expire_time) as expire_time,
CASE
WHEN MAX(expire_time) IS NOT NULL AND MAX(expire_time) < NOW() THEN 1
ELSE 0
END as is_expired
FROM (
-- 从order_rows表聚合已使用的礼金数据
SELECT
or_rows.gift_coupon_key,
or_rows.sku_id,
CAST(or_rows.sku_id AS CHAR) as sku_id,
or_rows.sku_name,
CASE
WHEN or_rows.pop_id IS NULL OR or_rows.pop_id = '' THEN 'g'
ELSE 'pop'
END as owner,
or_rows.order_id,
or_rows.gift_coupon_ocs_amount,
or_rows.order_time,
COUNT(DISTINCT or_rows.order_id) as use_count,
COALESCE(SUM(or_rows.gift_coupon_ocs_amount), 0) as total_ocs_amount,
MIN(or_rows.order_time) as create_time,
NULL as expire_time
FROM order_rows or_rows
WHERE or_rows.gift_coupon_key IS NOT NULL AND or_rows.gift_coupon_key != ''
@@ -50,7 +51,7 @@
AND or_rows.gift_coupon_key like concat('%', #{giftCouponKey}, '%')
</if>
<if test="skuId != null and skuId != ''">
AND or_rows.sku_id like concat('%', #{skuId}, '%')
AND CAST(or_rows.sku_id AS CHAR) like concat('%', #{skuId}, '%')
</if>
<if test="skuName != null and skuName != ''">
AND or_rows.sku_name like concat('%', #{skuName}, '%')
@@ -67,6 +68,40 @@
<if test="params.endTime != null and params.endTime != ''">
AND or_rows.order_time &lt;= #{params.endTime}
</if>
GROUP BY or_rows.gift_coupon_key
UNION ALL
-- 从gift_coupon表获取所有创建的礼金（包括未使用的）
SELECT
gc.gift_coupon_key,
gc.sku_id,
gc.sku_name,
gc.owner,
0 as use_count,
0 as total_ocs_amount,
gc.create_time,
gc.expire_time
FROM gift_coupon gc
WHERE 1=1
<if test="giftCouponKey != null and giftCouponKey != ''">
AND gc.gift_coupon_key like concat('%', #{giftCouponKey}, '%')
</if>
<if test="skuId != null and skuId != ''">
AND gc.sku_id like concat('%', #{skuId}, '%')
</if>
<if test="skuName != null and skuName != ''">
AND gc.sku_name like concat('%', #{skuName}, '%')
</if>
<if test="owner != null and owner != ''">
AND gc.owner = #{owner}
</if>
<if test="params.beginTime != null and params.beginTime != ''">
AND gc.create_time &gt;= #{params.beginTime}
</if>
<if test="params.endTime != null and params.endTime != ''">
AND gc.create_time &lt;= #{params.endTime}
</if>
) gc
GROUP BY gift_coupon_key
<if test="isExpired != null">
@@ -125,4 +160,46 @@
) stats
</select>
<insert id="insertGiftCoupon" parameterType="GiftCoupon">
INSERT INTO gift_coupon (
gift_coupon_key,
sku_id,
sku_name,
owner,
amount,
quantity,
create_time,
expire_time
) VALUES (
#{giftCouponKey},
#{skuId},
#{skuName},
#{owner},
#{amount},
#{quantity},
#{createTime},
#{expireTime}
)
ON DUPLICATE KEY UPDATE
sku_id = VALUES(sku_id),
sku_name = VALUES(sku_name),
owner = VALUES(owner),
amount = VALUES(amount),
quantity = VALUES(quantity),
expire_time = VALUES(expire_time)
</insert>
<update id="updateGiftCoupon" parameterType="GiftCoupon">
UPDATE gift_coupon
<set>
<if test="skuId != null and skuId != ''">sku_id = #{skuId},</if>
<if test="skuName != null and skuName != ''">sku_name = #{skuName},</if>
<if test="owner != null and owner != ''">owner = #{owner},</if>
<if test="amount != null">amount = #{amount},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="expireTime != null">expire_time = #{expireTime},</if>
</set>
WHERE gift_coupon_key = #{giftCouponKey}
</update>
</mapper>