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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
xvv 2024-09-18 10:29:40 +08:00
commit faafbc36d3
2 changed files with 6 additions and 3 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/integral/mapper/xml/IntegralGiftMapper.xml
View File

@ -94,7 +94,7 @@
left join integral_gift_category igc ON ig.category_id = igc.id
left join mt_goods mg ON ig.goods_id = mg.id
<where>
ig.store_id = #{integralGift.storeId}
ig.store_id = #{integralGift.storeId} and mg.stock >0
<if test="integralGift.id != null">
and ig.id = #{integralGift.id}

7
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -88,15 +88,18 @@
</div>
</div>
</div>
<!-- 支付方式 -->
<div class="bottom-posi">
<div class="center-left-wrap">
<div class="wrap-box" v-for="item in payList"
<div class="wrap-box"
@click="payMethod(item)"
v-for="item in payList"
v-if="item.dictValue!=='APPLET_CODE'"
:key="item.dictValue"
:value="item.dictValue"
:class="{ 'wrap-box2': item.dictValue === paymentType }"
>
<span @click="payMethod(item)">{{ item.dictLabel }}</span>
<span >{{ item.dictLabel }}</span>
</div>
</div>
<div class="center-left-bottom">