bug

fuintAdmin/src/views/member/userInfo.vue

@@ -444,15 +444,16 @@
           <div>
             <el-input v-model="authCode"
                       v-focus ref="getFocus"
-                      autofocus
+                      autofocus maxlength="10"
                       @input="changeSeekZero"
                       @keydown.enter.native="collection"
+                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                       placeholder="请输入收款金额">
             </el-input>
           </div>
           <div style="text-align: right;margin: 10px 0">
             <span>应找零</span>
-            <span style="color: red;font-size: 18px"> ￥{{ seekZero }}</span>
+            <span style="color: red;font-size: 18px"> ￥{{ seekZero.toFixed(2) }}</span>
           </div>
         </div>
         <el-divider></el-divider>
@@ -1068,9 +1069,9 @@ export default {
     // 计算找零金额
     changeSeekZero(){
       if (this.flag === 1) {
-        this.seekZero = (this.authCode - this.realyPayBills).toFixed(2)
+        this.seekZero = this.authCode - this.realyPayBills
       } else if (this.flag === 2) {
-        this.seekZero = (this.authCode - this.realyPayBills).toFixed(2)
+        this.seekZero = this.authCode - this.realyPayBills
       }
     },
     handleQuery(){

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java

@@ -351,7 +351,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
             for (Map<String, String> stringObjectMap : resultMapList) {
                 if (stringObjectMap.get("type").equals(cardFuelRecord.getType()) &&
                         stringObjectMap.get("oilType").equals(cardFuelRecord.getOilType())) {
-                    String refuelMoney = stringObjectMap.get("refuelMoney").toString();
+                    String refuelMoney = String.valueOf(stringObjectMap.get("refuelMoney"));
 //                    Double.valueOf(refuelMoney);
 
                     BigDecimal ref = new BigDecimal(refuelMoney);

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java

@@ -101,7 +101,7 @@ public class QrCodeUtils {
             File file1 = new File("/temp/qrCode/");
             // 判断目录是否存在
             if (!file1.exists()) {
-                file1.mkdir();
+                file1.mkdirs();
             }
 
             FileOutputStream outImgStream = new FileOutputStream(outImgPath);

fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java

@@ -80,7 +80,7 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
         File file1 = new File("/temp/qrCode/");
         // 判断目录是否存在
         if (!file1.exists()) {
-            file1.mkdir();
+            file1.mkdirs();
         }
 
         File file =new File(finalPath);

fuintCashier/build/latest.yml

@@ -1,8 +1,8 @@
 version: 1.0.0
 files:
-  - url: fuint收银系统 Setup 1.0.0.exe
+  - url: 蓝鲸智慧油站收银台 Setup 1.0.0.exe
     sha512: l8J4ix1xsfolq3NvAnhnnJqGvA/5vEESaDt+SJn9cld2YBC/RhWK0OuTSW+bXSm/EAfIFCciDGZ589pkTKALPg==
     size: 76790468
-path: fuint收银系统 Setup 1.0.0.exe
+path: 蓝鲸智慧油站收银台 Setup 1.0.0.exe
 sha512: l8J4ix1xsfolq3NvAnhnnJqGvA/5vEESaDt+SJn9cld2YBC/RhWK0OuTSW+bXSm/EAfIFCciDGZ589pkTKALPg==
 releaseDate: '2023-09-06T05:42:03.990Z'

fuintCashier/env/.env

@@ -1,3 +1,3 @@
 API_HOST = 'https://www.fuint.cn/fuint-application/'
 NODE_ENV = 'development'
-SYSTEM_NAME = 'fuint收银系统'
+SYSTEM_NAME = '蓝鲸智慧油站收银台'

fuintCashier/package.json

@@ -28,7 +28,7 @@
         "url": "http://127.0.0.1"
       }
     ],
-    "productName": "fuint收银系统",
+    "productName": "蓝鲸智慧油站收银台",
     "appId": "cn.fuint.cashier",
     "directories": {
       "output": "build"

fuintCashier/src/main/config/menu.js

@@ -59,7 +59,7 @@ function info() {
   dialog.showMessageBox({
     title: '关于',
     type: 'info',
-    message: 'fuint收银系统',
+    message: '蓝鲸智慧油站收银台',
     detail: `版本信息：${version}\n引擎版本：${process.versions.v8}\n当前系统：${os.type()} ${os.arch()} ${os.release()}`,
     noLink: true,
     buttons: ['查看官网', '确定']

fuintCashierWeb/.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = fuint收银系统
+VUE_APP_TITLE = 蓝鲸智慧油站收银台
 
 # 测试环境配置
 ENV = 'staging'

fuintCashierWeb/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fuintCashier",
   "version": "1.0.1",
-  "description": "fuint收银系统",
+  "description": "蓝鲸智慧油站收银台",
   "author": "FSQ",
   "license": "MIT",
   "scripts": {

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -120,14 +120,14 @@
           </div>
           <div>-￥{{ oilDiscount.toFixed(2) }}</div>
         </div>
-        <div class="center-left-hj" v-show="isMember && refuelMoney">
+        <div class="center-left-hj" v-show="isMember && refuelMoney1.length>0">
           <div>
             <el-checkbox
                          style="color: black;font-size: 16px"
                          v-model="checkAll3" @change="handleCheckAllChange3">
             </el-checkbox><!--:indeterminate="isIndeterminate3"-->
             囤油卡
-            <div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
+            <div style="margin: 5px 0" v-for="(item,index) in refuelMoney1" :key="index">
               （{{ item.type }}卡
 <!--              <span style="color: #00afff">{{ item.oilType }}</span>-->
               余额：{{ item.refuelMoney }}L）
@@ -482,9 +482,10 @@
           <div>
             <el-input v-model="authCode"
                       v-focus ref="getFocus"
-                      :key="inputKey"
+                      :key="inputKey"  maxlength="10"
                       @input="changeSeekZero"
                       @keydown.enter.native="collection"
+                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                       placeholder="请输入收款金额">
             </el-input>
           </div>
@@ -862,9 +863,10 @@
           <div>
             <el-input v-model="authCode"
                       v-focus ref="getFocus"
-                      autofocus
+                      autofocus  maxlength="10"
                       @input="changeSeekZero1"
                       @keydown.enter.native="collection1"
+                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                       placeholder="请输入收款金额">
             </el-input>
           </div>
@@ -1123,6 +1125,8 @@
           <div v-else-if="payType == 'ALIPAY'">支付宝</div>
           <div v-else-if="payType == 'UNIONPAY'">银联二维码</div>
           <div v-else-if="payType == 'credit'">挂账</div>
+          <div v-else-if="payType == 'oilCard'">囤油卡</div>
+          <div v-else-if="payType == 'balance'">储值卡</div>
           <div v-else>小程序码</div>
         </div>
         <div class="input-box1">
@@ -1166,7 +1170,7 @@
           <div>充值金额</div>
           <div>￥{{ realyPayBills }}</div>
         </div>
-        <div class="input-box">
+        <div class="input-box" v-if="cardValueForm.giftBalance">
           <div>赠送金额</div>
           <div>￥{{ cardValueForm.giftBalance }}</div>
         </div>
@@ -1355,6 +1359,7 @@
         fullReduction:0,
         // 囤油卡信息
         refuelMoney:null,
+        refuelMoney1:[],
         paymentActive:{
           type: 0,
           amount: 0,
@@ -1908,6 +1913,7 @@
                 } else if (payStatus === "payFail") {
                   this_.isPaySuccess = false;
                   this_.isQuery = false;
+                  clearInterval(timer);
                 }
               }
             })
@@ -1979,13 +1985,14 @@
                   this_.isPaySuccess = true;
                   this_.isQuery = false;
                   this_.rechargeOilCard = true
-                  await this_.printLocally2()
+                  await this.printLocally2()
-                  await this_.getMemberAfter();
+                  await this.getMemberAfter();
                   clearInterval(timer);
                 }
                 if (response.data.payStatus == "payFail") {
                   this_.isPaySuccess = false;
                   this_.isQuery = false;
+                  clearInterval(timer);
                 }
               }
             })
@@ -3643,6 +3650,7 @@
             for (let i = 0;i < _this.refuelMoney.length;i++){
               // 囤油卡升数变化
               if (_this.refuelMoney[i].oilType==item.oilName && _this.refuelMoney[i].refuelMoney>0){
+                this.refuelMoney1.push(item)
                 id = item.id
                 _this.isOilStorageCard = true
                 if (_this.refuelMoney[i].refuelMoney >= item.liters){
@@ -3653,10 +3661,6 @@
                   hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
                 }
               }
-              // }else {
-              //   _this.$message.error(item.liters)
-              //   hoardAmount = item.amount
-              // }
             }
           }
           _this.consumeRefuelMoney += +conRefMon
@@ -4141,6 +4145,29 @@
       },
       // 支付方式
       payMethod(payType){
+        if (payType == 'oilCard'){
+          if (this.isMember){
+            if (this.refuelMoney1.length>0){
+              this.checkAll3 = true
+              this.handleCheckAllChange3(true)
+            }else {
+              this.$message.error("请先充值囤油卡")
+              return;
+            }
+          }else {
+            this.$message.error("请先选择会员")
+            return
+          }
+        }
+        if (payType == 'balance'){
+          if (this.isMember){
+            this.checkAll4 = true
+            this.handleCheckAllChange4(true)
+          }else {
+            this.$message.error("请先选择会员")
+            return;
+          }
+        }
         this.typeIdex = payType
         this.map.payType = payType;
         this.payType = payType;

fuintCashierWeb/src/views/details/index.vue

@@ -445,15 +445,16 @@
           <div>
             <el-input v-model="authCode"
                       v-focus ref="getFocus"
-                      autofocus
+                      autofocus  maxlength="10"
                       @input="changeSeekZero"
                       @keydown.enter.native="collection"
+                      oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
                       placeholder="请输入收款金额">
             </el-input>
           </div>
           <div style="text-align: right;margin: 10px 0">
             <span>应找零</span>
-            <span style="color: red;font-size: 18px"> ￥{{ seekZero }}</span>
+            <span style="color: red;font-size: 18px"> ￥{{ seekZero.toFixed(2) }}</span>
           </div>
         </div>
         <el-divider></el-divider>
@@ -1140,9 +1141,9 @@ export default {
     // 计算找零金额
     changeSeekZero(){
       if (this.flag === 1) {
-        this.seekZero = (this.authCode - this.realyPayBills).toFixed(2)
+        this.seekZero = this.authCode - this.realyPayBills
       } else if (this.flag === 2) {
-        this.seekZero = (this.authCode - this.realyPayBills).toFixed(2)
+        this.seekZero = this.authCode - this.realyPayBills
       }
     },
     getName(list,type){