dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
齐天大圣 2024-03-11 11:13:57 +08:00
parent 0e95e453e3
commit 0f7ba19407
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
View File

@ -89,6 +89,7 @@
card_favorables.id, card_favorables.id,
card_favorables.couponAmount, card_favorables.couponAmount,
card_favorables.couponContent, card_favorables.couponContent,
card_favorables.instruction,
card_favorables.cardRecordId, card_favorables.cardRecordId,
card_favorables.endTime, card_favorables.endTime,
card_favorables.useStatus, card_favorables.useStatus,
@ -96,7 +97,7 @@
from from
(SELECT (SELECT
'优惠券' AS couponType, '优惠券' AS couponType,
cf.NAME couponName ,cf.id id,cf.discount_amount couponAmount,cf.satisfied_amount couponContent, cf.NAME couponName ,cf.id id,cf.discount_amount couponAmount,cf.card_detail couponContent,cf.instruction instruction,
cfr.id cardRecordId, cfr.end_time endTime, cf.exclusive_function exclusiveFunction,cfr.status useStatus cfr.id cardRecordId, cfr.end_time endTime, cf.exclusive_function exclusiveFunction,cfr.status useStatus
FROM FROM
card_favorable cf card_favorable cf
@ -110,7 +111,7 @@
and cf.type != 1 UNION ALL and cf.type != 1 UNION ALL
SELECT SELECT
'兑换券' AS couponType, '兑换券' AS couponType,
ce.NAME couponName, ce.id id, ce.count couponAmount, ce.use_instructions couponContent,cer.id cardRecordId, ce.NAME couponName, ce.id id, ce.count couponAmount, ce.card_detail couponContent,ce.use_instructions instruction,cer.id cardRecordId,
cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
FROM FROM
card_exchange_record cer card_exchange_record cer
@ -122,7 +123,7 @@
and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL
SELECT SELECT
'洗车券' AS couponType, '洗车券' AS couponType,
ce.NAME couponName, ce.id id, ce.count couponAmount, ce.use_instructions couponContent, ce.NAME couponName, ce.id id, ce.count couponAmount, ce.card_detail couponContent, ce.use_instructions instruction,
cer.id cardRecordId, cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus cer.id cardRecordId, cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
FROM FROM
card_exchange_record cer card_exchange_record cer
@ -134,7 +135,7 @@
and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL
SELECT SELECT
'洗车卡' AS couponType, '洗车卡' AS couponType,
ce.NAME couponName, ce.id id, ce.count couponAmount, ce.use_instructions couponContent,cer.id cardRecordId, ce.NAME couponName, ce.id id, ce.count couponAmount, ce.use_instructions couponContent,ce.use_instructions instruction,cer.id cardRecordId,
cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus cer.out_time endTime, ce.qr_code_link exclusiveFunction,cer.status useStatus
FROM FROM
card_exchange_record cer card_exchange_record cer

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
View File

@ -75,7 +75,7 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
}else { }else {
cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"打"+cardFavorableDTO.getSpecialDiscount()+"折"); cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"打"+cardFavorableDTO.getSpecialDiscount()+"折");
} }
cardFavorable.setInstruction("请到到店使用！"); cardFavorable.setInstruction("消费可用！");
return save(cardFavorable); return save(cardFavorable);
} }
@ -214,7 +214,7 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
}else if (StringUtils.isNotEmpty(cardFavorableDTO.getType()) &&cardFavorableDTO.getType().equals("1")){ }else if (StringUtils.isNotEmpty(cardFavorableDTO.getType()) &&cardFavorableDTO.getType().equals("1")){
cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"打"+cardFavorableDTO.getSpecialDiscount()+"折"); cardFavorable.setCardDetail("满"+cardFavorableDTO.getSatisfiedAmount()+"打"+cardFavorableDTO.getSpecialDiscount()+"折");
} }
cardFavorable.setInstruction("请到到店使用！"); cardFavorable.setInstruction("消费可用！");
return updateById(cardFavorable); return updateById(cardFavorable);
} }

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CouponVO.java
View File

@ -22,6 +22,7 @@ public class CouponVO implements Serializable {
private String couponName; private String couponName;
//券内容 //券内容
private String couponContent; private String couponContent;
private String instruction;
//使用状态 0:未使用 1：已使用 2：已失效 //使用状态 0:未使用 1：已使用 2：已失效
private String useStatus; private String useStatus;
//券有效期 //券有效期