From eac375458bf42572da06aab19e0ae6ecbb119c0a Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Tue, 2 Jan 2024 14:24:47 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oilConfig/oilPrice/index.vue    |  8 +++++---
 fuintAdmin_zt/src/views/Site/index.vue        |  5 +++--
 .../src/views/components/Service/index.vue    |  3 ++-
 .../fuyou/service/impl/FyPayServiceImpl.java  |  4 ++--
 .../mapper/xml/IntegralOrdersMapper.xml       |  1 +
 .../impl/IntegralOrdersServiceImpl.java       |  1 +
 gasStation-uni/pages/index/index.vue          |  4 ++--
 gasStation-uni/pagesHome/order/order.vue      | 20 +++++++++----------
 8 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
index a9fb7db6b..5105f7a4e 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
@@ -447,6 +447,7 @@ import {
         oilNumber:{
           oilType: '汽油',
           oilName: '',
+          numberId: '',
           oilPrice: '',
           gbPrice: '',
           receivingUnits: '元',
@@ -636,7 +637,7 @@ import {
           console.error(error);
         }
 
-  
+
       },
       // 选择油品类型之后触发
       oilTypeClick(data) {
@@ -646,12 +647,12 @@ import {
         // this.oilNumber.oilNameT = ''
 
         const selectedValue = this.oilNumber.oilType;
+        this.$forceUpdate();
         // this.getOilTypeList(selectedValue)
         this.getOilName(selectedValue)
       },
 
       oilTypeClick2() {
-        console.log("hellooooooooooooooooooo")
         this.oilNumber.oilName = ''
         this.oilNumber.oilNameT = ''
       },
@@ -699,6 +700,7 @@ import {
 
       // 修改
       async updateOilNumberin(){
+        console.log
         this.$refs["form"].validate(valid => {
             if (valid) {
               var this_ = this
@@ -828,7 +830,7 @@ import {
       changeOilName() {
         this.oilNumber.oilName = this.oilNumber.oilNameT
       },
-      
+
       getSecondName(){
         this.$forceUpdate();
       }
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index d50d0a3e5..3313d2170 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -116,19 +116,20 @@
                   width="160"
                   class-name="small-padding fixed-width"
                 >
+                <!-- v-hasPermi="['system:account:edit']" -->
+                <!-- v-hasPermi="['system:account:delete']" -->
+
                   <template slot-scope="scope">
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-edit"
-                      v-hasPermi="['system:account:edit']"
                       @click="handleUpdate(scope.row)"
                     >修改</el-button>
                     <el-button
                       size="mini"
                       type="text"
                       icon="el-icon-delete"
-                      v-hasPermi="['system:account:delete']"
                       @click="handleDelete(scope.row)"
                     >删除</el-button>
                     <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:account:resetPwd', 'system:account:edit']">
diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
index 7621ad70f..290f81df0 100644
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@@ -275,7 +275,8 @@
       return{
         dataForm:{coverImage:''},
         // 上传地址
-        uploadAction: 'http://192.168.0.178:8008/backendApi/file/upload',
+        // uploadAction: 'http://192.168.0.178:8008/backendApi/file/upload',
+        uploadAction: process.env.VUE_APP_SERVER_URL+'/backendApi/file/upload',
         uploadHeader: { 'Access-Token' : getToken() },
         // 隐藏上传
         hideUpload: false,
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 4c1de1a05..8eeb926b7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -332,8 +332,8 @@ public class FyPayServiceImpl implements FyPayService {
         Map<String, Object> res = new HashMap<>();
         try {
 //            查询商户配置信息
-//            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(receiveParameter.getStoreId());
-            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(16);
+            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(receiveParameter.getStoreId());
+//            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(16);
 //            查询用户信息
             LJUserVo userVo = userService.selectUserById(receiveParameter.getUserId());
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 58c85ca9e..c693460f7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -85,6 +85,7 @@
         left join integral_gift ig ON io.gift_id = ig.id
         left join mt_user_express_address ea ON io.address_id = ea.id
         <where>
+              io.store_id = #{integralOrders.storeId}
 
             <if test="integralOrders.giftName != null">
                 and ig.gift_name like CONCAT ('%',#{integralOrders.giftName},'%')
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index b38a9da34..ac8e000ff 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -344,6 +344,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
 
             integralOrders.setOrderNumber(orderNo);
             integralOrders.setStatus(status);
+            integralOrders.setUserId(nowAccountInfo.getId());
         }
         integralOrdersDao.insertBatch(integralOrdersList.getIntegralOrdersList());
 
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index a4254b4c2..e55568f61 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -186,7 +186,7 @@
 				let str = q.split("?")[1];
 				let arr = str.split("&");
 
-				let storeId = "12";
+				let storeId = "18";
 
 				let staffId = "";
 				arr.forEach(item => {
@@ -202,7 +202,7 @@
 				this.staffId = uni.getStorageSync("inviteStaffId")
 			} else {
 
-				let storeId = "12";
+				let storeId = "18";
 
 				uni.setStorageSync("storeId", storeId)
 				this.storeId = uni.getStorageSync("storeId")
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 7a358c9d1..08aecec54 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -115,7 +115,7 @@
 <script>
 	import config from '@/config'
 	import request from '../../utils/request'
-
+	import BigNumber from 'bignumber.js'
 	export default {
 
 
@@ -247,7 +247,7 @@
 							fail: function(err) {
 								request({
 									url: "business/integral/integralOrders/editPayStatus",
-									method: 'post',
+									method: 'get',
 									data: {
 										"orderNo": res.data.data.orderNo,
 										"status": "payFail",
@@ -340,6 +340,7 @@
 			},
 			// 金额计算
 			allData() {
+
 				this.allPoints = 0
 				this.allAmout = 0
 				let allPoints = new BigNumber(0)
@@ -370,24 +371,22 @@
 					// let markPurchases = new BigNumber(data.markPurchases);
 					// let exchangePoints = allPoints.multipliedBy(new BigNumber(data.exchangePoints));
 					// 拿到总的积分
-					this.myPoints = this.myPoints ? this.member.points : 0
+					this.myPoints = this.myPoints ? this.myPoints : 0
 					let points = this.myPoints - allPoints; // 使用 toNumber() 获取 BigNumber 的数值
-
+					console.log("myPoints", this.myPoints)
+					console.log("points", points)
 					// 以及分等一多少
-					if (points < 0) {
+					if (points <= 0) {
 
 						// 计算需要的金额
 						points = Math.abs(points);
 
 
 						this.allAmout = points * this.goodsInfo.moneyRatio.toFixed(2); // 直接使用 JavaScript 中的乘法
-						// this.allAmout = allAmout.toFixed(2);
-						// this.allAmout = Number(allAmout).toFixed(2);
-
+						this.allPoints = this.myPoints;
 					} else {
-
 						this.allAmout = 0
-						this.allPoints = exchangePoints.toNumber();
+						this.allPoints = allPoints;
 					}
 					return
 				}
@@ -426,6 +425,7 @@
 				}).then((res) => {
 					if (res.code == 200) {
 						this.myPoints = res.data.points
+						this.allData()
 					}
 				})
 			},