diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
index 5f6ab1cee..2f6d88ae0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
@@ -23,6 +23,13 @@ public interface MerchantConfigService extends IService<MerchantConfig> {
      */
     public MerchantConfig selectMeChByIdIsUse(int storeId);
 
+    /**
+     * 根据storeId修改消费后的金额信息
+     * @param storeId
+     * @param amount
+     */
+    void updateMeChAmountByStoreId(Integer storeId,Double amount);
+
     /**
      * 根据店铺id查询商户信息
      * @return
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 8eeb926b7..ffd8a5970 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
@@ -165,6 +165,7 @@ public class FyPayServiceImpl implements FyPayService {
                 List<ReturnRecord> returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo);
                 Date date = new Date();
                 if (reqMap.get("trans_stat").equals("SUCCESS")){
+                    merchantConfigService.updateMeChAmountByStoreId(storeId1,allAmount);
                     if (!ObjectUtil.isEmpty(oilOrder)){
 //                        油品订单
                         oilOrder.setOrderStatus("paid");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index b5abbc841..05d7e4ca5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -35,6 +35,16 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         return merchantConfig;
     }
 
+    @Override
+    public void updateMeChAmountByStoreId(Integer storeId,Double amount) {
+        MerchantConfig merchantConfig = this.selectMeChByIdIsUse(storeId);
+        if (ObjectUtil.isNotEmpty(merchantConfig)){
+            Double amount1 = merchantConfig.getAmount();
+            merchantConfig.setAmount(amount1);
+            this.updateMerch(merchantConfig);
+        }
+    }
+
     @Override
     public List<MerchantConfig> selectMeChByIsOpen() {
         QueryWrapper queryWrapper = new QueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 7b9fdf984..905846bb4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -3,6 +3,7 @@ package com.fuint.business.order.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.api.fuyou.service.MerchantConfigService;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.mapper.AllOrderInfoMapper;
 import com.fuint.business.order.service.AllOrderInfoService;
@@ -10,6 +11,8 @@ import com.fuint.business.order.service.OilOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 @Service
 public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllOrderInfo> implements AllOrderInfoService {
     @Override
@@ -24,8 +27,12 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         return baseMapper.insert(allOrderInfo);
     }
 
+    @Autowired
+    private MerchantConfigService merchantConfigService;
+
     @Override
     public int updateAllOrderInfo(AllOrderInfo allOrderInfo) {
+        merchantConfigService.updateMeChAmountByStoreId(allOrderInfo.getStoreId(),allOrderInfo.getPayMoney());
         return baseMapper.updateById(allOrderInfo);
     }
 
@@ -37,7 +44,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         int row = 0;
         AllOrderInfo allOrderInfo = this.selectAllOrderInfoByOrderNo(orderNo);
         if (ObjectUtil.isNotEmpty(allOrderInfo)){
-            allOrderInfo.setStatus(status);
+            allOrderInfo.setPayMoney(allOrderInfo.getGoodsMoney());
+            allOrderInfo.setStatus("paid");
+            allOrderInfo.setPayTime(new Date());
             row = this.updateAllOrderInfo(allOrderInfo);
 //            修改油品订单状态
             orderService.updateOrderStatus(orderNo,status);
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index fc71dbebc..e684593d2 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -91,6 +91,7 @@
         <div class="bottom-posi">
           <div class="center-left-wrap">
             <div class="wrap-box" v-for="item in payList"
+                 v-if="item.dictValue!='APPLET_CODE'"
                  :key="item.dictValue"
                  :value="item.dictValue">
               <span @click="payMethod(item.dictValue)">{{ item.dictLabel }}</span>
@@ -391,7 +392,7 @@ import {
   import BigNumber from 'bignumber.js';
   import PointsCashier from "@/views/cashier/NewComponents/integralOrder/pointsCashier";
   import {getDicts} from "@/api/dict/data";
-  import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
+import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/user";
   import {getUserGrade} from "@/api/cashier/usergrade";
   import {queryStaffs, staffInfo} from "@/api/cashier/staff";
 
@@ -555,7 +556,7 @@ import {
         // 根据手机号查询会员信息
         getUser(){
           if(this.select1=="会员手机号"){
-            getUserVoMobile({mobile:this.userNo}).then( response => {
+            getUserInfoMobile({mobile:this.userNo}).then( response => {
               if (response.data!=null){
                 this.member = response.data
               }else {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 0bbeafc49..739cf3862 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -1032,7 +1032,7 @@
         // 油号列表
         oilNumberList:[],
         // 是否可以点会员确定按钮
-        isSure:true,
+        isSure:false,
         // 优惠券消费金额
         couponAmount:0,
         // 是否为满减互斥
@@ -1447,7 +1447,7 @@
         this.userNo = "";
         this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
         this.goodsActualPay = this.goodsAmount - this.goodsDiscount
-        this.isSure = true;
+        this.isSure = false;
         this.handleChange();
       },
       // 根据会员等级信息获取等级优惠信息
@@ -2190,7 +2190,7 @@
       },
       // 选择会员信息
       handleChoose(data) {
-        this.isSure = false;
+        this.isSure = true;
         this.member = data;
         if (data.refuelMoney != null && data.refuelMoney != ""){
           this.refuelMoney = JSON.parse(data.refuelMoney)
@@ -2582,7 +2582,7 @@
         _this.resetting1();
       },
       resetting1(){
-        console.log(111)
+        // console.log(111)
         let _this = this;
         this.authCode = "";
         if (_this.isPaySuccess == true){
diff --git a/gasStation-uni/pagesMy/myorder/myorder.vue b/gasStation-uni/pagesMy/myorder/myorder.vue
index 30053fadc..2382742c8 100644
--- a/gasStation-uni/pagesMy/myorder/myorder.vue
+++ b/gasStation-uni/pagesMy/myorder/myorder.vue
@@ -100,7 +100,10 @@
 						</view>
 					</view> -->
 					<!-- 状态：加载更多、没有更多了... -->
-					<u-load-more :status="status"></u-load-more>
+					<!-- <u-load-more :status="status"></u-load-more> -->
+					<u-empty v-if="list.length == 0" mode="coupon" text="内容为空"
+						icon="http://cdn.uviewui.com/uview/empty/coupon.png">
+					</u-empty>
 				</scroll-view>
 			</view>
 
diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue
index af12a9c36..96a8e5580 100644
--- a/gasStation-uni/pagesMy/setup/index.vue
+++ b/gasStation-uni/pagesMy/setup/index.vue
@@ -17,8 +17,8 @@
 			<view class="box-hang" @click="goEdit(0)">
 				<view class="">昵称</view>
 				<view class="dis"> 
-					<text v-if="user.name==''">未填写</text> 
-					<text>{{user.name}}</text> 
+					<text v-if="!user.name">未填写</text> 
+					<text v-else>{{user.name}}</text> 
 					<uni-icons type="right" size="16"></uni-icons> 
 				</view>
 			</view>
@@ -32,7 +32,10 @@
 			</view>
 			<view class="box-hang" @click="goEdit(2)">
 				<view class="">车牌号</view>
-				<view class="dis"> <text>{{user.carNo}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
+				<view class="dis">
+					<text v-if="!user.carNo">未填写</text> 
+					<text v-else>{{user.carNo}}</text> <uni-icons type="right" size="16"></uni-icons> 
+				</view>
 			</view>
 			<!-- <view class="box-hang" @click="goEdit(3)">
 				<view class="">支付密码</view>