From 8215f03ac92361652f14b44f8f2e5a635a07c8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 24 Jan 2024 15:22:16 +0800
Subject: [PATCH 1/2] bug

---
 .../EventMarketing/cardExchange/index.vue     | 10 +--
 .../impl/ActiveExchangeServiceImpl.java       | 64 +++++++++++++++++++
 .../ActiveNewlywedsRecordsController.java     |  2 +-
 .../ActiveNewlywedsRecordsService.java        |  2 +-
 .../ActiveNewlywedsRecordsServiceImpl.java    |  5 +-
 .../impl/CardFavorableServiceImpl.java        |  6 +-
 gasStation-uni/pages/index/index.vue          | 29 +++++----
 gasStation-uni/pagesMy/Recharge/Recharge.vue  |  7 +-
 8 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index a2bc84779..edc262568 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -97,7 +97,7 @@
             <!--        <span>{{ scope.row.qrCodeLink }}</span>-->
           </template>
         </el-table-column>
-        <el-table-column label="参与次数" align="center" prop="count"/>
+<!--        <el-table-column label="参与次数" align="center" prop="count"/>-->
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime }}</span>
@@ -171,9 +171,9 @@
         <el-form-item label="使用说明" prop="useInstructions">
           <el-input type="textarea" v-model="form.useInstructions" placeholder="请输入使用说明"></el-input>
         </el-form-item>
-        <el-form-item label="参与次数" prop="count">
+<!--        <el-form-item label="参与次数" prop="count">
           <el-input-number v-model="form.count" controls-position="right" :min="1" :max="999"></el-input-number>
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
             <el-radio label="0">启用</el-radio>
@@ -275,9 +275,9 @@ export default {
         useInstructions: [
           { required: true, message: '请输入使用说明', trigger: 'change' }
         ],
-        count: [
+        /*count: [
           { required: true, message: '请输入参与次数', trigger: 'change' }
-        ],
+        ],*/
         status: [
           { required: true, message: '请选择状态', trigger: 'change' }
         ]
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
index 963d0b08f..7cb46f4f7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
@@ -761,6 +761,70 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
                 }
             }
         }
+
+        //三个优惠都不为空
+            BigDecimal bigDecimal = new BigDecimal("0.00");
+        if (ObjectUtils.isNotEmpty(paymentActiveVO.getActiveFavorableAmount()) && ObjectUtils.isNotEmpty(paymentActiveVO.getCardFavorableAmount())&& ObjectUtils.isNotEmpty(paymentActiveVO.getMemberFavorableAmount())) {
+            BigDecimal add3 = paymentActiveVO.getActiveFavorableAmount().add(paymentActiveVO.getCardFavorableAmount()).add(paymentActiveVO.getMemberFavorableAmount());
+            if (add3.compareTo(paymentActiveDTO.getAmount()) > 0){
+                BigDecimal add21 = paymentActiveVO.getActiveFavorableAmount().add(paymentActiveVO.getCardFavorableAmount());
+                BigDecimal add22 = paymentActiveVO.getActiveFavorableAmount().add(paymentActiveVO.getMemberFavorableAmount());
+                BigDecimal add23 = paymentActiveVO.getCardFavorableAmount().add(paymentActiveVO.getMemberFavorableAmount());
+                if (add21.compareTo(add22)>0 && add21.compareTo(add23)>0){
+                    paymentActiveVO.setMemberFavorableAmount(bigDecimal);
+                }
+                if (add22.compareTo(add21)>0 && add22.compareTo(add23)>0){
+                    paymentActiveVO.setCardFavorableAmount(bigDecimal);
+                }
+                if (add23.compareTo(add21)>0 && add23.compareTo(add22)>0){
+                    paymentActiveVO.setActiveFavorableAmount(bigDecimal);
+                }
+
+
+                if (paymentActiveVO.getActiveFavorableAmount().compareTo(add23)>0){
+                    paymentActiveVO.setCardFavorableAmount(bigDecimal);
+                    paymentActiveVO.setMemberFavorableAmount(bigDecimal);
+                }
+                if (paymentActiveVO.getCardFavorableAmount().compareTo(add22)>0){
+                    paymentActiveVO.setActiveFavorableAmount(bigDecimal);
+                    paymentActiveVO.setMemberFavorableAmount(bigDecimal);
+                }
+                if (paymentActiveVO.getMemberFavorableAmount().compareTo(add21)>0){
+                    paymentActiveVO.setActiveFavorableAmount(bigDecimal);
+                    paymentActiveVO.setCardFavorableAmount(bigDecimal);
+                }
+            }
+        }
+        //有空值
+        if (ObjectUtils.isEmpty(paymentActiveVO.getActiveFavorableAmount()) || ObjectUtils.isEmpty(paymentActiveVO.getCardFavorableAmount()) || ObjectUtils.isEmpty(paymentActiveVO.getMemberFavorableAmount())){
+            if (ObjectUtils.isEmpty(paymentActiveVO.getActiveFavorableAmount()) && ObjectUtils.isNotEmpty(paymentActiveVO.getCardFavorableAmount())&& ObjectUtils.isNotEmpty(paymentActiveVO.getMemberFavorableAmount())){
+                if (paymentActiveVO.getCardFavorableAmount().add(paymentActiveVO.getMemberFavorableAmount()).compareTo(paymentActiveDTO.getAmount())>0){
+                    if (paymentActiveVO.getCardFavorableAmount().compareTo(paymentActiveVO.getMemberFavorableAmount())>0){
+                        paymentActiveVO.setMemberFavorableAmount(bigDecimal);
+                    }else {
+                        paymentActiveVO.setCardFavorableAmount(bigDecimal);
+                    }
+                }
+            }
+            if (ObjectUtils.isEmpty(paymentActiveVO.getCardFavorableAmount()) && ObjectUtils.isNotEmpty(paymentActiveVO.getActiveFavorableAmount())&& ObjectUtils.isNotEmpty(paymentActiveVO.getMemberFavorableAmount())){
+                if (paymentActiveVO.getActiveFavorableAmount().add(paymentActiveVO.getMemberFavorableAmount()).compareTo(paymentActiveDTO.getAmount())>0){
+                    if (paymentActiveVO.getActiveFavorableAmount().compareTo(paymentActiveVO.getMemberFavorableAmount())>0){
+                        paymentActiveVO.setMemberFavorableAmount(bigDecimal);
+                    }else {
+                        paymentActiveVO.setActiveFavorableAmount(bigDecimal);
+                    }
+                }
+            }
+            if (ObjectUtils.isEmpty(paymentActiveVO.getMemberFavorableAmount()) && ObjectUtils.isNotEmpty(paymentActiveVO.getCardFavorableAmount())&& ObjectUtils.isNotEmpty(paymentActiveVO.getActiveFavorableAmount())){
+                if (paymentActiveVO.getCardFavorableAmount().add(paymentActiveVO.getActiveFavorableAmount()).compareTo(paymentActiveDTO.getAmount())>0){
+                    if (paymentActiveVO.getCardFavorableAmount().compareTo(paymentActiveVO.getActiveFavorableAmount())>0){
+                        paymentActiveVO.setActiveFavorableAmount(bigDecimal);
+                    }else {
+                        paymentActiveVO.setCardFavorableAmount(bigDecimal);
+                    }
+                }
+            }
+        }
         return paymentActiveVO;
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
index 96c783786..ffb8ca3fb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsRecordsController.java
@@ -86,7 +86,7 @@ public class ActiveNewlywedsRecordsController extends BaseController {
      * @return 新增结果
      */
     @PostMapping
-    public ResponseObject insert(@RequestBody ActiveNewlywedsRecords activeNewlywedsRecords) {
+    public ResponseObject insert(@RequestBody ActiveNewlywedsRecords activeNewlywedsRecords) throws Exception {
         return getSuccessResult(this.activeNewlywedsRecordsService.add(activeNewlywedsRecords));
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsRecordsService.java
index 509436b60..04eabae9b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsRecordsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsRecordsService.java
@@ -16,6 +16,6 @@ public interface ActiveNewlywedsRecordsService extends IService<ActiveNewlywedsR
      * @param activeNewlywedsRecords
      * @return
      */
-    boolean add(ActiveNewlywedsRecords activeNewlywedsRecords);
+    boolean add(ActiveNewlywedsRecords activeNewlywedsRecords) throws Exception;
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsRecordsServiceImpl.java
index 6192d580a..9a7cd4cf2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsRecordsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsRecordsServiceImpl.java
@@ -55,12 +55,15 @@ public class ActiveNewlywedsRecordsServiceImpl extends ServiceImpl<ActiveNewlywe
      */
     @Override
     @Transactional
-    public boolean add(ActiveNewlywedsRecords activeNewlywedsRecords) {
+    public boolean add(ActiveNewlywedsRecords activeNewlywedsRecords) throws Exception {
         boolean save = false;
         //用户信息
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer userId = nowAccountInfo.getId();
         LJUserVo ljUserVo = userService.selectUserById(userId,activeNewlywedsRecords.getStoreId());
+        /*if (ObjectUtils.isEmpty(ljUserVo)){
+            userBalanceService.initBalance(userId,activeNewlywedsRecords.getChainStoreId());
+        }*/
         //保存新人有礼记录
         ActiveNewlywedsVO activeNewlyweds = activeNewlywedsService.getOneByStoreId(activeNewlywedsRecords.getStoreId());
         activeNewlywedsRecords.setActiveNewlywedsId(activeNewlyweds.getId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
index e998aa2f3..da658190f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
@@ -114,10 +114,14 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
         if (CollectionUtils.isNotEmpty(list)){
             for (CardFavorableRecord cardFavorableRecord : list) {
                 for (CardFavorable record : records) {
-                    if(!cardFavorableRecord.getCardFavorableId().equals(record.getId())){
+                    if(record.getClaimRule().equals("0") && !cardFavorableRecord.getCardFavorableId().equals(record.getId())){
                         CardFavorable one = getById(record.getId());
                         cardFavorableArrayList.add(one);
                     }
+                    if (record.getClaimRule().equals("1")){
+                        //查询当天有没有领取这张券
+
+                    }
                 }
             }
         }
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 3045d2098..63c18ac9c 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -10,7 +10,7 @@
 						:autoplay="autoplay" :interval="interval" :duration="duration">
 						<swiper-item v-for="(item,index) in list1" :key="index" @click="goPage(item.routeUrl)">
 							<view class="swiper-item uni-bg-red">
-									
+
 								<image style="width: 100%;" :src="item.bannerUrl"></image>
 							</view>
 							<!-- <image style="width: 100%;" :src="getBannerUrl(item.bannerUrl)"></image> -->
@@ -86,9 +86,9 @@
 
 					<view class="station-title" style="display: flex;justify-content: space-between;">
 						{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-						<!-- <view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
+						<view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
 							<view>切换位置 <uni-icons type="right" color="#304fff" size="16"></uni-icons> </view>
-						</view> -->
+						</view>
 					</view><!--顺通石化加油站(工业南路站)-->
 					<view style="display: flex;">
 						<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">
@@ -136,10 +136,13 @@
 	import tabbar from "../../components/tabbar/tabbar.vue"
 	import config from '@/config'
 	import request from '../../utils/request'
-import { callWithErrorHandling } from "vue"
+	import {
+		callWithErrorHandling
+	} from "vue"
 	export default {
 		data() {
 			return {
+				chainStoreId: '',
 				indicatorDots: true,
 				autoplay: true,
 				interval: 2000,
@@ -215,6 +218,7 @@ import { callWithErrorHandling } from "vue"
 				uni.setStorageSync("storeId", storeId)
 				uni.setStorageSync("inviteStaffId", staffId)
 				this.storeId = uni.getStorageSync("storeId")
+				this.chainStoreId = uni.getStorageSync("chainStoreId")
 				this.staffId = uni.getStorageSync("inviteStaffId")
 				uni.showLoading({
 					title: uni.getStorageSync("storeId") + "++" + uni.getStorageSync("inviteStaffId") + q
@@ -242,11 +246,11 @@ import { callWithErrorHandling } from "vue"
 		},
 		methods: {
 			// 返回图片路径
-			getBannerUrl(url){
+			getBannerUrl(url) {
 				let imgurl = ""
-				if (url.includes("http")){
+				if (url.includes("http")) {
 					imgurl = url
-				}else {
+				} else {
 					imgurl = this.baseUrl + url
 				}
 				return imgurl;
@@ -266,10 +270,10 @@ import { callWithErrorHandling } from "vue"
 						method: 'get',
 					}).then(res => {
 						_this.list1 = res.data
-						for (let i = 0;i<res.data.length;i++){
-							if (res.data[i].bannerUrl.includes("http")){
+						for (let i = 0; i < res.data.length; i++) {
+							if (res.data[i].bannerUrl.includes("http")) {
 								_this.list1[i].bannerUrl = res.data[i].bannerUrl
-							}else{
+							} else {
 								_this.list1[i].bannerUrl = _this.baseUrl + res.data[i].bannerUrl
 							}
 						}
@@ -302,7 +306,8 @@ import { callWithErrorHandling } from "vue"
 					url: 'business/marketingActivity/activeNewlywedsRecords',
 					method: 'post',
 					data: {
-						storeId: this.storeId
+						storeId: this.storeId,
+						chainStoreId: this.chainStoreId,
 					}
 				}).then(res => {
 					console.log("11111" + res)
@@ -862,4 +867,4 @@ import { callWithErrorHandling } from "vue"
 		color: white;
 		margin: 0 auto;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesMy/Recharge/Recharge.vue b/gasStation-uni/pagesMy/Recharge/Recharge.vue
index 1d7187ffc..e78c28fa3 100644
--- a/gasStation-uni/pagesMy/Recharge/Recharge.vue
+++ b/gasStation-uni/pagesMy/Recharge/Recharge.vue
@@ -56,6 +56,7 @@
 	export default {
 		data() {
 			return {
+				appltType: "",
 				title: '',
 				tindex: 0,
 				status: 'loading',
@@ -68,7 +69,8 @@
 					storeId: '',
 					recordName: '',
 					pageNo: 1,
-					pageSize: 10
+					pageSize: 10,
+					appltType: '',
 				},
 				tapList: [{
 						text: "全部"
@@ -88,6 +90,9 @@
 
 		components: {
 
+		},
+		onLoad() {
+			this.appltType = uni.getstorageSync("appltType");
 		},
 		onShow() {
 			this.getAllOrderList();

From 803e28bdcde74368619a5e9f919bc8c48e15ea97 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 24 Jan 2024 17:10:37 +0800
Subject: [PATCH 2/2] bug

---
 .../order/controller/OilOrderController.java  | 10 ++
 .../business/order/entity/AllOrderInfo.java   |  2 +
 .../order/entity/CardValueChildOrder.java     |  2 +
 .../business/order/entity/CashierOrder.java   |  2 +
 .../fuint/business/order/entity/LJOrder.java  |  2 +
 .../fuint/business/order/entity/OilOrder.java |  3 +
 .../business/order/entity/ReturnRecord.java   |  2 +
 .../order/mapper/xml/OilOrderMapper.xml       |  2 +-
 .../order/service/OilOrderService.java        |  7 ++
 .../service/impl/OilOrderServiceImpl.java     |  7 ++
 .../views/cashier/NewComponents/homeindex.vue | 98 +++++++++++++++++--
 .../pagesMy/CardManagement/CardManagement.vue |  2 +-
 gasStation-uni/pagesMy/comment/comment.vue    | 20 +++-
 gasStation-uni/pagesMy/details/details.vue    | 14 ++-
 gasStation-uni/pagesMy/myorder/myorder.vue    | 19 +++-
 15 files changed, 170 insertions(+), 22 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
index ccbd8ca70..e13eead64 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
@@ -274,4 +274,14 @@ public class OilOrderController extends BaseController {
     public ResponseObject getOilOrderInfo(@PathVariable Integer id){
         return getSuccessResult(orderService.selectOilOrderDescByOrderId(id));
     }
+
+    /**
+     * 根据订单id修改订单评价
+     * @param order
+     * @return
+     */
+    @PutMapping("editOilOrder")
+    public ResponseObject editOilOrderRemark(@RequestBody OilOrder order){
+        return getSuccessResult(orderService.editOilOrder(order));
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
index bfc520593..84a0be7dc 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -53,6 +54,7 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
     /**
      * 付款方式（数据字典）
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
index 4cb9fa996..954f8ebe1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -65,6 +66,7 @@ public class CardValueChildOrder extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
     /**
      * 用户备注
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
index 83f3af19c..9f7ee6763 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -93,6 +94,7 @@ public class CashierOrder extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
     /**
      * 退款备注
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
index 383545f8d..f0be87e49 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -92,6 +93,7 @@ public class LJOrder extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
     /**
      * 操作员工
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
index 8050e8bb5..5bfc33365 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
@@ -4,10 +4,12 @@ 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.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.io.Serializable;
@@ -105,6 +107,7 @@ public class OilOrder extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
     /**
      * 富友订单号
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/ReturnRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/ReturnRecord.java
index 5549ebaec..678aebdc6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/ReturnRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/ReturnRecord.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -77,6 +78,7 @@ public class ReturnRecord extends BaseEntity implements Serializable {
     /**
      * 支付时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
     private Date payTime;
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 0e6ed7d3a..468adceba 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -74,7 +74,7 @@
                 and order_status = #{order.orderStatus}
             </if>
             <if test="order.remark != null and order.remark != ''">
-                and remark = #{order.remark}
+                and order_status = 'paid' and remark is null or remark = '' and order_status = 'paid'
             </if>
             <if test="order.payType != null and order.payType != ''">
                 and pay_type = #{order.payType}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
index 5c8ec10ac..3afc62375 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
@@ -157,4 +157,11 @@ public interface OilOrderService extends IService<OilOrder> {
      * @return
      */
     OilOrderVo selectOilOrderDescByOrderId(Integer orderId);
+
+    /**
+     * 小程序添加订单评论信息
+     * @param oilOrder
+     * @return
+     */
+    int editOilOrder(OilOrder oilOrder);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 5a1571837..f0402b898 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -1616,4 +1616,11 @@ return stringDoubleMap;
     public OilOrderVo selectOilOrderDescByOrderId(Integer orderId) {
         return baseMapper.selectOilOrderDescByOrderId(orderId);
     }
+
+    @Override
+    public int editOilOrder(OilOrder oilOrder) {
+        OilOrder oilOrder1 = this.selectOilOrderById(oilOrder.getId());
+        oilOrder1.setRemark(oilOrder.getRemark());
+        return baseMapper.updateById(oilOrder1);
+    }
 }
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 338b66be2..962f8b463 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -308,7 +308,7 @@
               <div v-else>{{ item.memberPrice }}</div>
               <div>
                 <el-input-number v-model="item.num" size="small" controls-position="right"
-                                 @change="handleChange" :min="1" :max="10"></el-input-number>
+                                 @change="handleChange" :min="1" :max="10000"></el-input-number>
               </div>
               <div @click="delGoods(index)"><i class="el-icon-circle-close" style="font-size: 22px"></i></div>
             </div>
@@ -802,6 +802,7 @@
   import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
   import {getSysConfig} from "@/api/staff/user/sysconfig";
   import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder";
+  import {getLodop} from "@/api/LodopFuncs";
 
   const cityOptions = ['上海', '北京'];
   export default {
@@ -1120,11 +1121,80 @@
     },
     methods:{
       async printLocally() {
-        const printHTML = document.querySelector('#reportSuccess').innerHTML
-        // 将打印的区域赋值，进行打印
-        window.document.body.innerHTML = printHTML
-        window.print() // 调用window打印方法
-        window.location.reload() // 打印完成后重新加载页面
+        //初始化打印函数
+        let LODOP = getLodop(); // 初始化打印
+        LODOP.PRINT_INIT();
+        var bodyStyle = `<style>
+            .input-box{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                font-size: 14px;
+                margin: 5px 0px;
+              }
+             .box-ge{
+                border-bottom: 1px solid #000000 ;
+                box-sizing: border-box;
+                padding: 10px;
+              }
+              .box-title{
+                font-size: 18px;
+                text-align: center;
+                align-items: center;
+                margin-top: 15px;
+              }
+              .input-hui{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                font-size: 14px;
+                margin: 15px 0px;
+                background: #b2b2b2;
+                box-sizing: border-box;
+                padding: 5px 0px;
+              }
+              .input-hui-frou{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                font-size: 14px;
+                margin: 15px 0px;
+                background: #b2b2b2;
+                box-sizing: border-box;
+                padding: 5px 0px;
+                div{
+                  width: 25%;
+                  text-align: left;
+                }
+              }
+              .input-box-frou{
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                font-size: 14px;
+                margin: 5px 0px;
+                div{
+                  width: 25%;
+                  text-align: left;
+                }
+              }
+            </style>
+            `
+        var fromHtml = bodyStyle+this.$refs.report.innerHTML
+
+
+        LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
+
+        LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
+
+        // LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
+        // let preview = LODOP.PREVIEW();
+        // console.log("preview",preview);
+        LODOP.PRINT();
 
       },
       clear(){
@@ -2433,6 +2503,7 @@
                 _this.loading = false;
                 _this.isPay = true;
                 _this.isPaySuccess = true;
+                _this.printLocally()
                 _this.resetting1();
               },3000)
             }else {
@@ -2449,15 +2520,18 @@
           return;
         }
 
+        let isPaySuccess = false;
+
         await addLJGoods(_this.map).then( response => {
           _this.orderNo = response.data.orderNo;
           if (response.data.oilOrder!=null){
+            console.log(123,response.data.oilOrder)
             if (response.data.oilOrder.orderStatus == "paid"){
               _this.isPaySuccess = true;
+              isPaySuccess = true
               _this.isPay = true;
               _this.seekZero = 0
               _this.amount = 0
-              _this.resetting1()
               for (let i =0;i<_this.oilPreferentialData.length;i++){
                 _this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId
                 _this.oilPreferentialData[i].oilPreferential.userId = response.data.oilOrder.userId
@@ -2465,17 +2539,19 @@
                 usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
               }
               _this.printLocally()
+              _this.resetting1()
               return;
             }
           }
           if (response.data.goodsOrder!=null){
             if (response.data.goodsOrder.status == "paid"){
               _this.isPaySuccess = true;
+              isPaySuccess = true
               _this.isPay = true;
               _this.seekZero = 0
               _this.amount = 0
-              _this.resetting1()
               _this.printLocally()
+              _this.resetting1()
               return;
             }
           }
@@ -2493,9 +2569,11 @@
           }
         })
         this.loading = true;
-        _this.queryPayStatus();
+        if ( !isPaySuccess ){
+          await _this.queryPayStatus();
 
-        _this.resetting1();
+          _this.resetting1();
+        }
       },
       resetting1(){
         let _this = this;
diff --git a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
index fc7f69264..3a36602f7 100644
--- a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
+++ b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue
@@ -83,7 +83,7 @@
 						</view>
 						<view class="but-box">
 							<view class="huis">订单时间</view>
-							<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
+							<view class="" v-if="item.orderStatus=='paid'">{{item.payTime}}</view>
 							<view class="" v-else>{{item.createTime}}</view>
 						</view>
 						<view class="but-box">
diff --git a/gasStation-uni/pagesMy/comment/comment.vue b/gasStation-uni/pagesMy/comment/comment.vue
index d7b0b2159..eac4fabbc 100644
--- a/gasStation-uni/pagesMy/comment/comment.vue
+++ b/gasStation-uni/pagesMy/comment/comment.vue
@@ -30,7 +30,7 @@
 				</view> -->
 				<u--textarea v-model="value1" placeholder="请输入内容"></u--textarea>
 			</view>
-			<view class="anniu">
+			<view class="anniu" @click="editOilOrder">
 				<text>提交</text>
 			</view>
 
@@ -75,6 +75,9 @@
 				baseUrl: this.$baseUrl,
 			}
 		},
+		onLoad(e){
+			this.orderId = e.orderId
+		},
 		onShow() {
 			this.getUser()
 		},
@@ -82,6 +85,21 @@
 
 		},
 		methods: {
+			editOilOrder(){
+				let remark = "评分："+this.value+"分，"+this.value1
+				request({
+					url: 'business/oilOrder/editOilOrder',
+					method: 'put',
+					data: {"id":this.orderId,"remark":remark},
+				}).then(res => {
+					if (res.data==1) {
+						uni.showToast({
+							title:"评论成功"
+						})
+						this.goback()
+					}
+				})
+			},
 			// 查询当前登录用户信息
 			getUser(){
 				request({
diff --git a/gasStation-uni/pagesMy/details/details.vue b/gasStation-uni/pagesMy/details/details.vue
index 043018aab..6bf19eff4 100644
--- a/gasStation-uni/pagesMy/details/details.vue
+++ b/gasStation-uni/pagesMy/details/details.vue
@@ -48,15 +48,19 @@
 					<view class="hui-size">储值卡或囤油卡消费金额</view>
 					<view class="">{{oilOrder.orderAmount - oilOrder.discountAmount - oilOrder.payAmount}}元</view>
 				</view>
-				<view class="dis-fx">
-					<view class="hui-size">加油数量</view>
-					<view class="">{{oilOrder.oilNum}}升</view>
-				</view>
 				<!-- <view class="box-title">优惠信息</view> -->
 				<view class="dis-fx" v-if="oilOrder.discountAmount>0">
 					<view class="hui-size">优惠金额</view>
 					<view class="">{{oilOrder.discountAmount}}元</view>
 				</view>
+				<view class="dis-fx">
+					<view class="hui-size">加油数量</view>
+					<view class="">{{oilOrder.oilNum}}升</view>
+				</view>
+				<view class="dis-fx" v-if="oilOrder.payTime">
+					<view class="hui-size">交易时间</view>
+					<view class="">{{oilOrder.payTime}}升</view>
+				</view>
 
 			</view>
 			<view class="anniu" v-if="oilOrder.orderStatus=='paid' && oilOrder.remark" @click="gocomment()">
@@ -115,7 +119,7 @@
 			},
 			gocomment() {
 				uni.navigateTo({
-					url: '/pagesMy/comment/comment'
+					url: '/pagesMy/comment/comment?orderId=' + this.orderId
 				})
 			},
 			goback() {
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index 20fb0a2b4..e01ead1be 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -52,10 +52,15 @@
 						</view>
 						<view class="but-box" @click="goOrderInfo(item.id)">
 							<view class="huis">订单时间</view>
-							<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
+							<view class="" v-if="item.orderStatus=='paid'">{{item.payTime}}</view>
 							<view class="" v-else>{{item.createTime}}</view>
 						</view>
-						<view v-if="item.orderStatus=='paid' && item.remark" class="end-box" @click="goComment()">
+						<view v-if="item.orderStatus=='paid' && item.remark==null" class="end-box" @click="goComment(item.id)">
+							<view class="anniu">
+								<text>去评价</text>
+							</view>
+						</view>
+						<view v-if="item.orderStatus=='paid' && item.remark==''" class="end-box" @click="goComment(item.id)">
 							<view class="anniu">
 								<text>去评价</text>
 							</view>
@@ -171,6 +176,9 @@
 			this.getStores()
 			// this.getPayList()
 		},
+		onShow() {
+			this.getTapIndex(0)
+		},
 		components: {
 
 		},
@@ -336,6 +344,9 @@
 				})
 			},
 			getTapIndex(index) {
+				this.orderList = []
+				this.list = []
+				this.total = 0
 				this.tapindex = index
 				if (this.tapindex == 0) {
 					this.map = {
@@ -413,9 +424,9 @@
 					url: '/pagesMy/details/details?orderId=' + orderId,
 				})
 			},
-			goComment() {
+			goComment(orderId) {
 				uni.navigateTo({
-					url: "/pagesMy/comment/comment"
+					url: "/pagesMy/comment/comment?orderId=" + orderId,
 				})
 			},
 			goBack() {