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-01-23 10:56:44 +08:00
parent 937fcee22f
commit 56892e22bf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
View File

@ -20,6 +20,8 @@ public class CardValueRecordDTO extends CardValueRecord {
private Integer cardFavorableId;
//卡券领取记录id
private Integer cardRecordId;
private String appltType;
private String paymentType;
// /**
// * 会员id

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -67,15 +67,19 @@
combined_result.storeId,
combined_result.OilName,
combined_result.type
combined_result.paymentType
FROM
(SELECT '储值卡' AS recordName,mt_user_id mtUserId, recharge_balance rechargeBalance, gift_balance obtain, fringe_benefit oilName,royalty_type type,create_time createTime, chain_store_id chainStoreId, store_id storeId FROM card_value_record
(SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, gift_balance obtain, fringe_benefit oilName,royalty_type type,create_time createTime, chain_store_id chainStoreId, store_id storeId FROM card_value_record
UNION
SELECT '升数卡' AS recordName,mt_user_id mtUserId, recharge_balance rechargeBalance, income_litres obtain,oil_name oilName,type, create_time createTime, chain_store_id chainStoreId, store_id storeId FROM card_fuel_record) AS combined_result
SELECT '升数卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, income_litres obtain,oil_name oilName,type, create_time createTime, chain_store_id chainStoreId, store_id storeId FROM card_fuel_record) AS combined_result
<where>
<if test="cardValueRecord.mtUserId != null">
and combined_result.mtUserId = #{cardValueRecord.mtUserId}
</if>
<if test="cardValueRecord.appltType != null">
and combined_result.payment_type = #{cardValueRecord.appltType}
</if>
<if test="cardValueRecord.storeId != null">
and combined_result.storeId = #{cardValueRecord.storeId}
</if>