From a913c83238628642fe8218da985a043fa0808407 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Fri, 1 Dec 2023 16:40:20 +0800
Subject: [PATCH] no message

---
 .../fuint/repository/model/MtUserGrade.java   | 13 ++--
 gasStation-uni/package-lock.json              |  5 ++
 gasStation-uni/package.json                   |  1 +
 gasStation-uni/pagesHome/order/order.vue      | 12 ++--
 .../pagesRefuel/orderDetail/index.vue         | 61 +++++++++++--------
 5 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
index 1c894f6de..e5114ba46 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/MtUserGrade.java
@@ -1,6 +1,7 @@
 package com.fuint.repository.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -28,8 +29,8 @@ public class MtUserGrade implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty("商户ID")
-    private Integer merchantId;
+//    @ApiModelProperty("商户ID")
+//    private Integer merchantId;
 
     @ApiModelProperty("等级")
     private Integer grade;
@@ -37,19 +38,23 @@ public class MtUserGrade implements Serializable {
     @ApiModelProperty("等级名称")
     private String name;
 
-    @ApiModelProperty("升级会员等级条件描述")
-    private String catchCondition;
+//    @ApiModelProperty("升级会员等级条件描述")
+//    private String catchCondition;
 
     @ApiModelProperty("升级会员等级条件，init:默认获取;pay:付费升级；frequency:消费次数；amount:累积消费金额升级")
+    @TableField(exist = false)
     private String catchType;
 
     @ApiModelProperty("达到升级条件的值")
+    @TableField(exist = false)
     private BigDecimal catchValue;
 
     @ApiModelProperty("会员权益描述")
+    @TableField(exist = false)
     private String userPrivilege;
 
     @ApiModelProperty("有效期")
+    @TableField(exist = false)
     private Integer validDay;
 
     @ApiModelProperty("享受折扣")
diff --git a/gasStation-uni/package-lock.json b/gasStation-uni/package-lock.json
index 1c000e3e5..a1cef3dc3 100644
--- a/gasStation-uni/package-lock.json
+++ b/gasStation-uni/package-lock.json
@@ -47,6 +47,11 @@
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true
     },
+    "bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
diff --git a/gasStation-uni/package.json b/gasStation-uni/package.json
index ffb1f8c80..790011dee 100644
--- a/gasStation-uni/package.json
+++ b/gasStation-uni/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "@dcloudio/uni-ui": "^1.4.28",
+    "bignumber.js": "^9.1.2",
     "uview-ui": "^2.0.36"
   },
   "devDependencies": {
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index dec7bfde0..e8b9b2ba2 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -109,10 +109,11 @@
 <script>
 	import config from '@/config'
 	import request from '../../utils/request'
-	// import BigNumber from BigNumber
+	import BigNumber from 'bignumber.js';
 
 	export default {
 
+
 		data() {
 			return {
 				myPoints: 0, //我的积分 
@@ -201,21 +202,22 @@
 				console.log("hhhhhhhhhhhhhhhhhhhhhhhhh")
 				this.allPoints = 0
 				this.allAmout = 0
-				let allPoints = new BigNumber(this.allPoints)
-				let allAmout = new BigNumber(this.allAmout)
+				let allPoints = new BigNumber(this.goodsInfo.exchangePoints)
+				let allAmout = new BigNumber(this.goodsInfo.exchangeAmount)
 				// 数量
 				if (this.value < 1) {
 					this.value = 1
 				}
 				let value = new BigNumber(this.value)
 
-				allPoints.times(value)
+				allPoints = allPoints.times(value)
 				if (this.goodsInfo.exchangeMethod == '积分+金额') {
-					allPoints.times(value)
+					allAmout = allAmout.times(value)
 				}
 
 
 
+				console.log("hhhhhhhhhhhhhhhhhhhhhhhhh11", allPoints)
 
 				// 更新组件的值
 				this.allPoints = Number(allPoints).toFixed(2);
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 4cb3e4c6b..a148886f7 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -9,7 +9,8 @@
 			</view>
 			<!-- 顶部区域 -->
 			<view style="background-color: white;width: 94%;margin: 15px auto;">
-				<view style="font-weight: bold;height: 40px;line-height: 40px;margin-left: 10px;margin-top: 20px;">订单详情</view>
+				<view style="font-weight: bold;height: 40px;line-height: 40px;margin-left: 10px;margin-top: 20px;">订单详情
+				</view>
 				<view class="desc">
 					<view>油站名称</view>
 					<view>{{store.name}}{{store.description ? "("+store.description+")" : ""}}</view>
@@ -35,7 +36,7 @@
 					<view>{{staff.realName}}</view>
 				</view>
 			</view>
-			
+
 			<view style="background-color: white;width: 94%;margin: 15px auto;">
 				<view class="desc">
 					<view>优惠券</view>
@@ -45,14 +46,16 @@
 				<view class="desc">
 					<view style="display: flex;">
 						加油金
-						<span style="color: red;display: flex;">(余额：0.00)<u-icon name="question-circle" color="red"></u-icon></span>
+						<span style="color: red;display: flex;">(余额：0.00)<u-icon name="question-circle"
+								color="red"></u-icon></span>
 					</view>
 					<view>未选择优惠券</view>
 				</view>
 			</view>
-			
+
 			<view style="background-color: white;width: 94%;margin: 15px auto;">
-				<view style="font-weight: bold;height: 40px;line-height: 40px;margin-left: 10px;margin-top: 20px;">支付方式</view>
+				<view style="font-weight: bold;height: 40px;line-height: 40px;margin-left: 10px;margin-top: 20px;">支付方式
+				</view>
 				<view class="desc">
 					<view>微信支付</view>
 					<u-radio-group v-model="value">
@@ -69,7 +72,8 @@
 					</view>
 					<view style="color: red;font-size: 12px;">应付金额</view>
 				</view>
-				<view style="margin-right: 20px;width: 30%;border-radius:30px;background-color: #1879ff;height: 40px;line-height: 40px;text-align: center;color: white">
+				<view
+					style="margin-right: 20px;width: 30%;border-radius:30px;background-color: #1879ff;height: 40px;line-height: 40px;text-align: center;color: white">
 					确认支付
 				</view>
 			</view>
@@ -83,17 +87,17 @@
 		data() {
 			return {
 				title: '',
-				value:'',
-				orderNo:"",
+				value: '',
+				orderNo: "",
 				// 油品订单信息
-				oilOrder:{},
+				oilOrder: {},
 				// 员工列表信息
 				staff: {},
 				// 店铺信息
-				store:{},
-				oilPrice:0,
+				store: {},
+				oilPrice: 0,
 				// 油品名称
-				oilName:"",
+				oilName: "",
 			}
 		},
 		onLoad(e) {
@@ -108,13 +112,15 @@
 		},
 		methods: {
 			// 获取油品订单
-			getOilOrder(){
+			getOilOrder() {
 				let _this = this;
 				request({
 					url: "business/oilOrder/orderNo",
 					method: 'post',
-					data: {orderNo:_this.orderNo},
-				}).then((res)=>{
+					data: {
+						orderNo: _this.orderNo
+					},
+				}).then((res) => {
 					_this.oilOrder = res.data
 					_this.getStaffList(res.data.staffId)
 					_this.getStore(res.data.storeId)
@@ -122,36 +128,38 @@
 				})
 			},
 			// 获取门店信息
-			getStore(id){
+			getStore(id) {
 				let _this = this;
 				request({
 					url: "business/storeInformation/store/queryStoreById",
 					method: 'post',
-					data:{"storeId":id},
-				}).then((res)=>{
+					data: {
+						"storeId": id
+					},
+				}).then((res) => {
 					_this.store = res.data;
 				})
 			},
 			// 根据员工id获取员工信息
-			getStaffList(staffId){
+			getStaffList(staffId) {
 				let _this = this;
 				request({
 					url: "business/member/staff/" + staffId,
 					method: 'get',
-				}).then((res)=>{
+				}).then((res) => {
 					_this.staff = res.data
-					console.log(res,1)
+					console.log(res, 1)
 				})
 			},
 			// 获取当前店铺油号信息
-			getOilNumber(storeId){
+			getOilNumber(storeId) {
 				let _this = this;
 				request({
 					url: "business/petrolStationManagement/oilNumber/getOilNumberName/" + storeId,
 					method: 'get',
-				}).then((res)=>{
+				}).then((res) => {
 					res.data.forEach(item => {
-						if (item.oilName == _this.oilOrder.oils){
+						if (item.oilName == _this.oilOrder.oils) {
 							_this.oilPrice = item.gbPrice;
 							_this.oilName = item.oilNames;
 						}
@@ -166,7 +174,7 @@
 </script>
 
 <style scoped lang="scss">
-	.desc{
+	.desc {
 		height: 35px;
 		line-height: 35px;
 		margin-left: 20px;
@@ -176,6 +184,7 @@
 		font-size: 15px;
 		color: rgba(0, 0, 0, 0.65);
 	}
+
 	.bar {
 		width: 100%;
 		height: 70px;
@@ -186,7 +195,7 @@
 		align-items: center;
 		justify-content: space-between;
 	}
-	
+
 	.content {
 		background: #f4f5f6;
 	}