From 24818cb60ea34e86184bc4dc2ecf75cb55f427df Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 1 Mar 2024 17:55:13 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/views/convenienceStore/index.vue      |  4 +---
 fuintAdmin/src/views/member/fixingLevel.vue          | 11 ++++++++++-
 .../convenienceSore/mapper/xml/LJGoodsMapper.xml     |  6 +++---
 .../service/impl/CertifiedMemberServiceImpl.java     |  2 +-
 .../src/views/cashier/NewComponents/homeindex.vue    | 12 +++++++++---
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue
index d5a92bddd..1cf6a3f67 100644
--- a/fuintAdmin/src/views/convenienceStore/index.vue
+++ b/fuintAdmin/src/views/convenienceStore/index.vue
@@ -469,15 +469,14 @@ export default {
     selectSupplier(data){
       this.supplier = data.name;
       this.form1.supplierId = data.id
+      this.$set(this.form1,'supplierId',data.id)
       // this.$forceUpdate()
     },
     addSupplier(val){
-      // console.log(val,222)
       if (!val){
         return;
       }
       addSupplier({name:val,remark:"添加商品自动添加",ifDelete:'0'}).then(async res => {
-        // console.log(res)
         if (res.data == 1) {
           this.supplier = val;
           this.$modal.msgSuccess("已为您自动添加此供应商")
@@ -487,7 +486,6 @@ export default {
     },
     // 提交按钮
     submitForm1: function() {
-      console.log(this.form1.supplierId,8274)
       this.$refs["form1"].validate(valid => {
         if (valid) {
           if (this.form1) {
diff --git a/fuintAdmin/src/views/member/fixingLevel.vue b/fuintAdmin/src/views/member/fixingLevel.vue
index 8a40fbabd..42ec977e8 100644
--- a/fuintAdmin/src/views/member/fixingLevel.vue
+++ b/fuintAdmin/src/views/member/fixingLevel.vue
@@ -210,7 +210,7 @@
                   <el-tooltip placement="top"
                               v-if="scope.row.gasolineDiscount=='无优惠'">
                     <div slot="content">无优惠</div>
-                    <el-tag type="warning">{{ scope.row.dieselDiscount }}</el-tag>>
+                    <el-tag type="warning">{{ scope.row.gasolineDiscount }}</el-tag>>
                   </el-tooltip>
                   <span v-if="scope.row.gasolineRule!=null && scope.row.gasolineRule!=''">
                     <el-tooltip placement="top"
@@ -1070,6 +1070,15 @@ export default {
         ],
         this.resetForm("form");
     },
+    // 删除图片
+    handleDelete1(file){
+      // const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      // if (findex > -1) {
+      //   this.fileList.splice(findex, 1);
+      //   this.$emit("input", this.listToString(this.fileList));
+      // }
+      console.log(111)
+    },
     // 表单重置
     reset1() {
       this.form1 = {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
index b98818c5e..a880daa63 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml
@@ -53,13 +53,13 @@
         <where>
             mg.store_id = #{goods.storeId} and mg.if_delete = '0'
             <if test="goods.cvsGoodId != null and goods.cvsGoodId != ''">
-                and cvs_good_id = #{goods.cvsGoodId}
+                and mg.cvs_good_id = #{goods.cvsGoodId}
             </if>
             <if test="goods.supplierId != null and goods.supplierId != ''">
-                and supplier_id = #{goods.supplierId}
+                and mg.supplier_id = #{goods.supplierId}
             </if>
         </where>
-        order by sort
+        order by mg.sort
     </select>
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
index 37a3c20a3..d953a086c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/CertifiedMemberServiceImpl.java
@@ -171,7 +171,7 @@ public class CertifiedMemberServiceImpl extends ServiceImpl<CertifiedMemberMappe
         queryWrapper.eq("mobile",certifiedMember.getMobile());
         queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
         CertifiedMember member = baseMapper.selectOne(queryWrapper);
-        if (ObjectUtil.isNotEmpty(member)){
+        if (member.getId()!=certifiedMember.getId()){
             row = 0;
             return row;
         }
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 7de547406..e4fbff1b7 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -89,7 +89,7 @@
           </div>
           <div>-￥{{ fullReduction.toFixed(2) }}</div>
         </div>
-        <div class="center-left-hj" v-show="isMember && gradeDiscount.length>0">
+        <div class="center-left-hj" v-show="isMember">
           <div>
             <el-popover
               placement="bottom-start"
@@ -2885,6 +2885,7 @@
           _this.gradeDiscount = [];
           if (response.data) {
             _this.oilOrder.forEach(item => {
+
               let discount = {type:"",discount:0,oilName:item.oilName,gunName:item.gunName}
               if (item.type == "汽油") {
                 if (response.data.fixingLevel){
@@ -3100,6 +3101,7 @@
         //     this.getCoupon();
         //   }
         // }
+        await this.getGrade(this.member.id,this.member.gradeId)
         if (this.balance>0 && this.oilAmount>0 && !this.isOilStorageCard){
           this.checkAll4 = true
           if (this.goodsOrder.length==0){
@@ -3107,7 +3109,6 @@
           }
           this.countAmountFull()
         }
-        await this.getGrade(this.member.id,this.member.gradeId)
         if (!this.isFixingLevel && !this.isOilStorageCard){
           await this.getOilCoupon()
         }
@@ -3611,7 +3612,7 @@
       async getOilOrder(){
         this.dialogVisibleamount = false
         this.form.oilType = this.oilNameID;
-        // this.form.type = this.type;
+        this.form.type = this.type;
         let amount = this.form.amount || 0;
         // 计算油的升数
         if (this.select == "元"){
@@ -3622,6 +3623,7 @@
           this.form.amount = (this.form.oilPrice * amount).toFixed(2)
         }
 
+        if (this.form.tankId)
         // 校验油罐内油是否足够
         await getOilTank(this.form.tankId).then(async res => {
           if (res.data.storedQuantity-this.form.liters<0){
@@ -3791,6 +3793,10 @@
       // 根据手机号查询会员信息
       getUser(){
         if(this.select1=="会员手机号"){
+          if (!this.userNo) {
+            this.$message.error("请先输入手机号")
+            return;
+          }
           getUserInfoMobile({mobile:this.userNo}).then( response => {
             if (response.data!=null){
               this.member = response.data