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:
cun-nan 2024-03-02 17:58:59 +08:00
parent 9d869e404f
commit 2552723bfd
3 changed files with 119 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -100,6 +100,7 @@
type="primary" type="primary"
@click="batchGrounding('jy')" @click="batchGrounding('jy')"
>商品下架</el-button> >商品下架</el-button>
<div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
</div> </div>
<el-table ref="tables" v-loading="loading" :data="list" <el-table ref="tables" v-loading="loading" :data="list"

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
View File

@ -217,7 +217,8 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
for (String s : split) { for (String s : split) {
LJGoods ljGoods = this.selectLJGoodsById(Integer.parseInt(s)); LJGoods ljGoods = this.selectLJGoodsById(Integer.parseInt(s));
if (ObjectUtil.isNotEmpty(ljGoods)){ if (ObjectUtil.isNotEmpty(ljGoods)){
if (status.equals("qy") && ljGoods.getStock()==0){ if (status.equals("qy") && ljGoods.getStock()==0 ||
status.equals("qy") && ljGoods.getRetailPrice()==0 && ljGoods.getMemberPrice()==0){
ljGoods.setStatus("jy"); ljGoods.setStatus("jy");
}else { }else {
ljGoods.setStatus(status); ljGoods.setStatus(status);

36
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -53,6 +53,7 @@
<div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div> <div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div>
<div class="hj-box" style="justify-content: flex-end">合计: ￥{{ (oilAmount + goodsAmount).toFixed(2) }}</div> <div class="hj-box" style="justify-content: flex-end">合计: ￥{{ (oilAmount + goodsAmount).toFixed(2) }}</div>
</div> </div>
<div style="overflow-y: scroll;height: 42vh">
<div class="center-left-hj"> <div class="center-left-hj">
<div> <div>
<el-popover <el-popover
@ -102,8 +103,8 @@
<div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div> <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right"> <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
<div style="color: red">-￥{{ item.discount }}</div> <div style="color: red">-￥{{ item.discount }}</div>
<!-- <div v-if="item.type=='满减优惠'" style="color: grey">消费满{{ item.full }}元，立减{{ item.reduce }}元</div>--> <!-- <div v-if="item.type=='满减优惠'" style="color: grey">消费满{{ item.full }}元，立减{{ item.reduce }}元</div>-->
<!-- <div v-else style="color: grey">消费满{{ item.full }}元，每升优惠{{ item.liters }}元</div>--> <!-- <div v-else style="color: grey">消费满{{ item.full }}元，每升优惠{{ item.liters }}元</div>-->
</div> </div>
</div> </div>
</el-checkbox> </el-checkbox>
@ -129,7 +130,7 @@
囤油卡 囤油卡
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index"> <div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
（{{ item.type }}卡 （{{ item.type }}卡
<!-- <span style="color: #00afff">{{ item.oilType }}</span>--> <!-- <span style="color: #00afff">{{ item.oilType }}</span>-->
余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L） 余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
</div> </div>
</div> </div>
@ -151,20 +152,20 @@
placement="bottom-start" placement="bottom-start"
width="400" width="400"
trigger="click"> trigger="click">
<!-- <div>--> <!-- <div>-->
<!-- <el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">--> <!-- <el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">-->
<!-- <el-radio v-for="(item,index) in couponDiscount"--> <!-- <el-radio v-for="(item,index) in couponDiscount"-->
<!-- :label="item.gunName" :key="index" style="display: flex;">--> <!-- :label="item.gunName" :key="index" style="display: flex;">-->
<!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">--> <!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
<!-- <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>--> <!-- <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>-->
<!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">--> <!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
<!-- <div style="color: red">-￥{{ item.discount }}</div>--> <!-- <div style="color: red">-￥{{ item.discount }}</div>-->
<!--&lt;!&ndash; <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>&ndash;&gt;--> <!--&lt;!&ndash; <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>&ndash;&gt;-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-radio>--> <!-- </el-radio>-->
<!-- </el-radio-group>--> <!-- </el-radio-group>-->
<!-- </div>--> <!-- </div>-->
<div slot="reference"> <div slot="reference">
<el-checkbox <el-checkbox
style="color: black;font-size: 16px" style="color: black;font-size: 16px"
@ -191,6 +192,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="bottom-posi"> <div class="bottom-posi">
<div class="center-left-wrap"> <div class="center-left-wrap">
<div class="wrap-box" value="oilCard" <div class="wrap-box" value="oilCard"