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

111

Browse Source
This commit is contained in:
齐天大圣 2024-01-19 18:18:27 +08:00
parent dd2eb971a3
commit 6c1257e605
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -167,9 +167,9 @@
<el-select v-model="ruleForm.oilType" placeholder="请选择" >
<el-option
v-for="dict in oilList"
:key="dict.id"
:key="dict.id.toString()"
:label="dict.oilName"
:value="dict.id">
:value="dict.id.toString()">
</el-option>
</el-select>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -362,6 +362,7 @@
FROM
active_discount ad
LEFT JOIN active_discount_child adc ON ad.id = adc.active_discount_id
left join active_discount_records adr on adr.active_discount_id = ad.id
WHERE
ad.store_id = #{storeId}
AND adc.amount <![CDATA[ <= ]]> #{amount}
@ -370,6 +371,7 @@
AND ad.STATUS = 0
AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%')
AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%')
HAVING sum(adr.id) <![CDATA[ < ]]> limitAcount
GROUP BY ad.id
</select>
@ -385,6 +387,7 @@
FROM
active_fullminus af
LEFT JOIN active_discount_child adc ON af.id = adc.active_fullminus_id
left join active_fullminus_records afr on afr.active_fullminus_id = ad.id
WHERE
af.store_id = #{storeId}
AND adc.amount <![CDATA[ <= ]]> #{amount}
@ -393,6 +396,7 @@
AND af.STATUS = 0
AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%')
AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%')
HAVING sum(afr.id) <![CDATA[ < ]]> limitAcount
GROUP BY af.id
</select>