From 8f3453641119b3369b1d63a45a6e8b0c8cd5cd83 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sun, 29 Sep 2024 11:20:08 +0800
Subject: [PATCH] 9.29

---
 .../fuint/business/store/entity/MtStore.java  |  2 +
 .../storeInformation/entity/LJStore.java      |  5 ++
 .../sys/entity/SysNotificationlog.java        |  4 ++
 .../com/fuint/repository/model/TAccount.java  |  4 ++
 .../pagesHome/myPointsOrder/details.vue       | 49 +++++--------------
 5 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/entity/MtStore.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/entity/MtStore.java
index b55a77ebe..1556fb410 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/entity/MtStore.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/store/entity/MtStore.java
@@ -85,6 +85,8 @@ public class MtStore extends BaseEntity implements Serializable {
 
     @ApiModelProperty("门头照")
     private String doorstepPhoto;
+    @ApiModelProperty("退款密码")
+    private String refPass;
     @ApiModelProperty("服务到期时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date expirationTime;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/entity/LJStore.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/entity/LJStore.java
index 454dd936c..ed21dbe20 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/entity/LJStore.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/entity/LJStore.java
@@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.business.petrolStationManagement.vo.OilNumberNameVo;
 import com.fuint.repository.model.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -13,6 +14,7 @@ import lombok.Setter;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -89,6 +91,9 @@ public class LJStore extends BaseEntity implements Serializable {
     private String ifDelete;
     private String refPass;
 
+    @ApiModelProperty("服务到期时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date expirationTime;
     @TableField(exist = false)
     private List<String> welfareList;
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotificationlog.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotificationlog.java
index bb499d289..ce4addbbe 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotificationlog.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/entity/SysNotificationlog.java
@@ -28,6 +28,10 @@ public class SysNotificationlog extends BaseEntity {
      */
     private Integer notifyId;
     private Long deptId;
+    /**
+     * 店铺id
+     */
+    private Integer storeId;
 /**
      * 接收者，字符长度最多255，不能为空
      */
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
index 9a796f26a..94f319ed5 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
@@ -78,6 +78,10 @@ public class TAccount extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String deptType;
 //    @TableField(exist = false)
+    /**
+     * 0未删除  1  删除
+     */
+    private String ifDelete;
     private String mobile;
 
     @TableField(exist = false)
diff --git a/gasStation-uni/pagesHome/myPointsOrder/details.vue b/gasStation-uni/pagesHome/myPointsOrder/details.vue
index 1709f1b57..79da27d18 100644
--- a/gasStation-uni/pagesHome/myPointsOrder/details.vue
+++ b/gasStation-uni/pagesHome/myPointsOrder/details.vue
@@ -100,63 +100,40 @@
 					code: 'https://qm.qq.com/cgi-bin/qm/qr?k=LKqML292dD2WvwQfAJXBUmvgbiB_TZWF&noverify=0', // 生成二维码的值
 					size: 300, // 460代表生成的二维码的宽高均为460rpx
 				},
+				orderId:'',
 			}
-		},
-		onLoad() {
-
 		},
 		onPullDownRefresh() {
 			//下拉刷新
-			this.resetting() //重置方法
-			this.getList() //调用请求
 			uni.stopPullDownRefresh()
 		},
 		onReachBottom() {
 			// 触底加载
 			if (this.pageNo >= this.totalPage) {
-				uni.showToast({
-					title: '没有下一页数据',
-					icon: 'none'
-				})
+				
 			} else {
 				this.pageNo++
-				this.getList()
 			}
 		},
+		onLoad(e) {
+
+		},
 
 		components: {
 
 		},
 		methods: {
-			//滞空方法
-			resetting() {
-				this.pageNo = 1
-				this.pageSize = 10
-				this.totalPage = ''
-				this.List = []
-			},
-			// 分页——网络请求
-			async getList() {
-				uni.showLoading({
-					title: '加载中'
-				});
-				let res = await request({
-					url: '网络请求',
+			getInfo(){
+				request({
+					url: 'business/integral/integralOrders/queryByPageUni',
 					method: 'get',
-					data: {
-						pageNo: this.pageNo,
-						pageSize: this.pageSize,
+					params: this.query
+				
+				}).then((res) => {
+					if (res.code == 200) {
+						
 					}
 				})
-				if (res.code == 200) {
-					uni.hideLoading(); //交互反馈
-					if (this.pageNo != 1) {
-						this.List = this.ruleList.concat(res.result.records)
-					} else {
-						this.List = res.result.records
-					}
-					this.totalPage = res.result.pages
-				}
 			},
 			goback() {
 				uni.navigateBack()