Merge remote-tracking branch 'origin/master'

fuintAdmin/src/components/map/mapComponent.vue

@@ -91,7 +91,7 @@ export default {
       }).then((AMap) => {
         this.map = new AMap.Map("container", {
           viewMode: "2D", //是否为3D地图模式
-          zoom: 11, //初始化地图级别
+          zoom: 16, //初始化地图级别
           center: [_this.form.lng, _this.form.lat], //初始化地图中心点位置
         });
         // console.log(this.map.center)

fuintAdmin/src/views/member/fixingLevel.vue

@@ -294,11 +294,11 @@
                 <dict-tag :options="dict.type.yes_or_no" :value="scope.row.growthValueRule"/>
               </template>
             </el-table-column>
-            <el-table-column label="优惠券" align="center" prop="couponRule">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.yes_or_no" :value="scope.row.couponRule"/>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="优惠券" align="center" prop="couponRule">-->
+<!--              <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.yes_or_no" :value="scope.row.couponRule"/>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="储值优惠" align="center" prop="storeValue">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.yes_or_no" :value="scope.row.storeValue"/>
@@ -745,21 +745,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="优惠券参与" prop="couponRule">
-              <el-radio-group v-model="form.couponRule">
-                <el-radio label="yes">参与</el-radio>
-                <el-radio label="no">不参与</el-radio>
-              </el-radio-group>
-              <div>
-                <div style="color: grey;font-size: 12px;height: 18px">
-                  如用户有优惠券,消费是否可以直接使用优惠券抵用优惠、设置不参与、用户消费无法使用优惠券
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="优惠券参与" prop="couponRule">-->
+<!--              <el-radio-group v-model="form.couponRule">-->
+<!--                <el-radio label="yes">参与</el-radio>-->
+<!--                <el-radio label="no">不参与</el-radio>-->
+<!--              </el-radio-group>-->
+<!--              <div>-->
+<!--                <div style="color: grey;font-size: 12px;height: 18px">-->
+<!--                  如用户有优惠券,消费是否可以直接使用优惠券抵用优惠、设置不参与、用户消费无法使用优惠券-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="储值优惠参与" prop="storeValue">
@@ -1167,6 +1167,15 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "编辑固定等级类型";
+        if (response.data.gasolineRule){
+          this.gasolinePreferential = JSON.parse(response.data.gasolineRule)
+        }
+        if (response.data.dieselRule){
+          this.dieselPreferential = JSON.parse(response.data.dieselRule)
+        }
+        if (response.data.naturalGasRule){
+          this.naturalGasPreferential = JSON.parse(response.data.naturalGasRule)
+        }
       });
     },
     // 修改按钮操作
@@ -1208,22 +1217,30 @@ export default {
           this.form.naturalGasRule = JSON.stringify(this.naturalGasPreferential)
           if (this.form.id) {
             updateFixingLevel(this.form).then(response => {
-              this.$modal.msgSuccess("认证类型更新成功");
-              this.open = false;
-              this.getList();
+              if (response.data==1){
+                this.$modal.msgSuccess("认证类型更新成功");
+                this.open = false;
+                this.getList();
+              }else {
+                this.$modal.msgError("认证类型失败，固定等级名称不可重复");
+              }
             });
           } else {
-            queryFixingLevel({name:this.form.name}).then( response => {
-              if(response.data!=null){
-                this.$modal.msgError("固定等级名称不可重复");
-              }else {
+            // queryFixingLevel({name:this.form.name}).then( response => {
+            //   if(response.data!=null){
+            //     this.$modal.msgError("固定等级名称不可重复");
+            //   }else {
                 addFixingLevel(this.form).then(response => {
-                  this.$modal.msgSuccess("认证类型创建成功");
-                  this.open = false;
-                  this.getList();
+                  if (response.data==1) {
+                    this.$modal.msgSuccess("认证类型创建成功");
+                    this.open = false;
+                    this.getList();
+                  }else {
+                    this.$modal.msgError("固定等级名称不可重复");
+                  }
                 });
-              }
-            })
+            //   }
+            // })
           }
         }
       });

fuintAdmin/src/views/oilConfig/oilGun/list.vue

@@ -160,6 +160,13 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
       let this_ = this
       await this_.getList()
     },
+    watch: {
+      dialogVisible: function (newValue, oldValue) {
+        if (oldValue) {
+          this.$refs["gunForm"].resetFields();
+        }
+      }
+    },
     methods:{
       handleIsopenSelect() {
         this.$forceUpdate()
@@ -172,6 +179,11 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
       },
       // 添加油枪
       gunAdd(numberId){
+        // this.$refs["gunForm"].validate
+        // 假设 formRules 是你的验证规则对象
+        // this.$refs.gunForm.clearValidate(); // 清空验证状态
+        // this.$set(this, 'formRules', {}); // 设置为空对象
+
         let this_ = this;
         this_.dialogVisible = true;
         this_.judgement = false;

fuintAdmin/src/views/oilConfig/oilStatistics/list.vue

@@ -58,7 +58,7 @@
       </div>
       </el-row>
 
-      <el-table ref="tables"
+      <el-table key="2" ref="tables"
                 v-loading="loading"
                 :data="statisticsList"
                 :default-sort="defaultSort">
@@ -141,7 +141,8 @@
           <el-table ref="tables"
                   v-loading="loading"
                   :data="trackList"
-                  :default-sort="defaultSort">
+                  :default-sort="defaultSort"
+          key="1">
           <el-table-column
             lable="#"
             type="index"
@@ -258,7 +259,7 @@ export default {
       })
     },
     getTrackingList(data) {
-      this.queryParams2.tankId = data.id,
+      // this.queryParams2.tankId = data.id
       getTrackingApi(this.queryParams2).then(res=>{
         this.trackList = res.data.records
         this.total2 = res.data.total;
@@ -273,7 +274,7 @@ export default {
       this_.statisticsForm.storedQuantity = data.storedQuantity,
       this_.statisticsForm.updateTime = data.updateTime,
       this_.statisticsForm.unit = data.unit,
-
+      this_.queryParams2.tankId = data.id
       this.trackList = []
       this_.getTrackingList(data)
       this.drawer=true

fuintAdmin/src/views/staff/list.vue

@@ -633,7 +633,9 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.auditPrem = this.form.auditPrem.toString();
+          if (this.form.auditPrem){
+            this.form.auditPrem = this.form.auditPrem.toString();
+          }
           if (!this.form.id) {
             queryStaff({mobile:this.form.mobile}).then( response => {
               if(response.data!=null){
@@ -676,7 +678,7 @@ export default {
         this.form.refundPassword = '123456'
         this.open = true;
         this.title = "编辑员工信息";
-        if (this.form.auditPrem.length > 0){
+        if (this.form.auditPrem && this.form.auditPrem.length > 0){
           // this.form.auditPrem = this.form.auditPrem.split(",");
           this.auditPrem = []
           this.auditPrem = this.form.auditPrem.split(",");

fuintAdmin_zt/.env.production

@@ -8,7 +8,7 @@ ENV = 'production'
 VUE_APP_BASE_API = '/fuint-application/'
 
 # 发布目录
-VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
+VUE_APP_PUBLIC_PATH = '/oilZt/'
 
 # 后端接口地址
 VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'

fuintAdmin_zt/src/main.js

@@ -49,6 +49,7 @@ Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 // Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
 Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
+// Vue.prototype.pcUrl = 'http://47.95.206.185:85/'
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

fuintAdmin_zt/src/views/login.vue

@@ -254,7 +254,8 @@ export default {
         code:this.loginForm.telcode
       }
       this.$store.dispatch("codeLogin", data).then(() => {
-        this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+        // this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+        this.$router.push({ path: "/Service/index" }).catch(()=>{});
       }).catch(() => {
         this.loading = false;
 
@@ -279,7 +280,8 @@ export default {
             Cookies.remove('rememberMe');
           }
           app.$store.dispatch("Login", this.loginForm).then(() => {
-            app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            // app.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            app.$router.push({ path: "/Service/index" }).catch(()=>{});
           }).catch(() => {
             app.loading = false;
             if (app.captchaOnOff) {

fuintBackend/configure/dev/application.properties

@@ -39,7 +39,7 @@ system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
 website.url=https://www.fuint.cn/h5/
 
 # \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
-images.root=d:/rouyi/uploadPath
+images.root=d:/ruoyi/uploadPath
 images.path=/static/uploadImages/
 
 # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
@@ -124,3 +124,7 @@ weixin.subMessage.pointChange=[{'key':'amount', 'name':'\u53D8\u52A8\u6570\u91CF
 rocketmq.name-server=127.0.0.1:9876
 //2
 rocketmq.producer.group=provider
+
+# \u5458\u5DE5\u7801\u80CC\u666F\u56FE\u8BBE\u7F6E
+staff.bg=/static/qrCodeImg/laigeyouhui_bg.jpg
+staff.logo=/static/qrCodeImg/logo.png

fuintBackend/configure/prod/application.properties

@@ -124,3 +124,7 @@ weixin.subMessage.pointChange=[{'key':'amount', 'name':'\u53D8\u52A8\u6570\u91CF
 rocketmq.name-server=127.0.0.1:9876
 //2
 rocketmq.producer.group=provider
+
+# \u5458\u5DE5\u7801\u80CC\u666F\u56FE\u8BBE\u7F6E
+staff.bg=/static/qrCodeImg/laigeyouhui_bg.jpg
+staff.logo=/static/qrCodeImg/logo.png

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java

@@ -139,19 +139,6 @@ public class IntegralOrdersController extends BaseController {
 
     /**
      *
-     * 礼品订单
-     *
-     * 判断积分是否足够
-     *
-     * 增加订单之前首先判断是否还存在 库存
-     *
-     * 增加积分订单
-     *
-     * 减去积分商城库存
-     *
-     * 减去商品库存
-     *
-     * 减去用户积分
      *
      */
     @PostMapping("integralOrdersProcessing")

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml

@@ -443,7 +443,7 @@
 
     </update>
     <update id="updatePaymentType">
-        update integral_orders set status = '1' where order_number = #{orderNumber}
+        update integral_orders set processing_status = '1' where order_number = #{orderNumber}
     </update>
 
     <select id="queryIntegralOrdersByOrderNo">

fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java

@@ -177,13 +177,6 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
         integralOrdersList.setStoreId(nowAccountInfo.getStoreId());
         // 首先判断是否足够积分
         LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(integralOrdersList.getIntegralOrdersList().get(0).getUserId(), nowAccountInfo.getChainStoreId());
-        if (ObjectUtil.isEmpty(ljUserVos)) {
-            // 个人信息为空时，初始化
-//            return
-//            userBalanceService.initBalance(integralOrdersList.getIntegralOrdersList().get(0).getUserId(), nowAccountInfo.getChainStoreId());
-//            ljUserVos = ljUserMapper.selectAllInfoById2(integralOrdersList.getIntegralOrdersList().get(0).getUserId(), nowAccountInfo.getChainStoreId());
-        }
-
         if (ljUserVos.getPoints() < integralOrdersList.getAllPoints()) {
             integralOrdersList.getIntegralOrdersList().get(0).setStatus("un");
             return integralOrdersList.getIntegralOrdersList().get(0);
@@ -456,7 +449,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
 
         // 首先判断是否足够积分
         LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(nowAccountInfo.getId(), integralOrdersList.getChainStoreId());
-        if (ljUserVos.getPoints() < integralOrdersList.getAllPoints()) {
+        if (ljUserVos.getPoints() <= integralOrdersList.getAllPoints()) {
             integralOrdersList.getIntegralOrdersList().get(0).setStatus("un");
             applet.put("code", "error");
             applet.put("msg", "积分不足");

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -44,8 +44,10 @@ import com.fuint.business.member.service.ILJStaffService;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.entity.CardBalanceChange;
 import com.fuint.business.order.entity.CashierOrder;
+import com.fuint.business.order.entity.GrowthValueChange;
 import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.service.CardBalanceChangeService;
+import com.fuint.business.order.service.GrowthValueChangeService;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.UserBalance;
@@ -418,6 +420,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
 
     CardValueChildMapper cardValueChildMapper;
 
+
+    @Resource
+    GrowthValueChangeService growthValueChangeService;
     /**
      * 查询支付状态 修改相关关联表
      * @param id
@@ -473,7 +478,18 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
                 integralDetailService.insert2(integralDetail);
             }
             // 成长值变动明细
+            if (!ObjectUtil.isEmpty(cardValueRecord.getGrowthValue()) && cardValueRecord.getGrowthValue() != 0) {
+                GrowthValueChange growthValueChange = new GrowthValueChange();
+                growthValueChange.setUserId(cardValueRecord.getMtUserId());
+                growthValueChange.setChainStoreId(cardValueRecord.getChainStoreId());
 
+                growthValueChange.setStoreId(cardValueRecord.getStoreId());
+                growthValueChange.setFromType("余额充值赠送");
+                growthValueChange.setGrowthValue(cardValueRecord.getGrowthValue());
+                growthValueChange.setOrderNo(cardValueRecord.getPaymentNo());
+                growthValueChange.setAfterTheChange(userBalance.getGrowthValue());
+                growthValueChangeService.insertGrowthValueChange(growthValueChange);
+            }
             // 员工提成
             if (ObjectUtil.isNotEmpty(cardValueRecord.getMtStaffId()) && !ObjectUtil.isEmpty(cardValueRecord.getRoyaltyType()) && !"1".equals(cardValueRecord.getRoyaltyType())) {
                 CommissionRecord commissionRecord = employeeCommissions(cardValueRecord);
@@ -519,6 +535,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
                         cardExchangeRecordService.addCardExchangeRecord(cardExchangeRecord);
                     }
                 }catch (Exception e) {
+                    redisLock.unlock(lockKey);
+
                     e.printStackTrace();
                     continue;
                 }
@@ -534,10 +552,10 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
 
 
             redisLock.unlock(lockKey);
-        } else {
-            redisLock.unlock(lockKey);
-            return cardValueRecord;
         }
+//        else {
+//            return cardValueRecord;
+//        }
             return cardValueRecord;
     }
     //添加余额明细表
@@ -546,7 +564,11 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         cardBalanceChange.setUserId(cardValueRecord.getMtUserId());
         cardBalanceChange.setChangeType("1");
         cardBalanceChange.setFromType("余额充值");
+
         cardBalanceChange.setBalance(cardValueRecord.getRechargeBalance());
+        if ("1".equals(cardValueRecord.getRechargeType())) {
+            cardBalanceChange.setBalance(cardValueRecord.getAmount());
+        }
         cardBalanceChange.setStoreId(cardValueRecord.getStoreId());
         cardBalanceChange.setOrderNo(cardValueRecord.getPaymentNo());
         cardBalanceChange.setChainStoreId(cardValueRecord.getChainStoreId());
@@ -567,8 +589,15 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         if (ObjectUtil.isEmpty(ljUserVos.getGrowthValue())) ljUserVos.setGrowthValue(0);
 
 
+        String rechargeBalance =cardValueRecordDTO.getRechargeBalance().toString();
+
+        if ("1".equals(cardValueRecordDTO.getRechargeType())) {
+            rechargeBalance = cardValueRecordDTO.getAmount().toString();
+        }
+
+
         // 计算之后修改对应余额
-        BigDecimal bigBidBalance = new BigDecimal(cardValueRecordDTO.getRechargeBalance());
+        BigDecimal bigBidBalance = new BigDecimal(rechargeBalance);
 
         BigDecimal addCardValance = bigBidBalance.add(new BigDecimal(ljUserVos.getCardBalance())); //
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java

@@ -22,6 +22,7 @@ import com.fuint.utils.Digests;
 import com.fuint.utils.Encodes;
 import jdk.nashorn.internal.parser.Token;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -229,18 +230,23 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     private SettingService settingService;
     @Autowired
     private BackendFileController backendFileController;
+    @Autowired
+    private Environment env;
 
     @Override
     public String createStaffQrCode(int id, HttpServletRequest request) throws Exception {
+        ;;
 //        根据id查询员工信息和店铺信息
         LJStaff staff = this.selectStaffById(id);
         LJStore store = storeService.selectStoreByStoreId(staff.getStoreId());
         //在图片上生成二维码
-        String backgroundImage = "D:/ruoyi/qrCode/cailibao_bg.jpg";
-        String logoImage = "D:/ruoyi/qrCode/logo.png";
+//        String backgroundImage = "/static/qrCodeImg/laigeyouhui_bg.jpg";
+//        String logoImage = "/static/qrCodeImg/logo.png";
+        String backgroundImage = env.getProperty("staff.bg");
+        String logoImage = env.getProperty("staff.logo");
         String url = staff.getStaffCode();
         String area = store.getName();
-        String finalPath="D:/ruoyi/qrCode/" + area + ".jpg";
+        String finalPath="D:/qrCode/" + area + ".jpg";
         //背景图片路径 loge图片 二维码 输出地址
         createLogoCodePicture(backgroundImage, logoImage, url, finalPath, area,store.getAddress());
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/utils/QrCodeUtils.java

@@ -1,5 +1,6 @@
 package com.fuint.business.member.utils;
 
+import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.extra.qrcode.QrConfig;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
@@ -27,7 +28,10 @@ public class QrCodeUtils {
         try {
             // 读取原图片信息
             //得到文件
-            File file = ResourceUtils.getFile(roundImage);
+//            File file = ResourceUtils.getFile(roundImage);
+            ClassPathResource resource = new ClassPathResource(roundImage);
+            ClassPathResource logoResource = new ClassPathResource(logoImage);
+            File file = resource.getFile();
             //文件转化为图片
             Image srcImg = ImageIO.read(file);
             //获取图片的宽
@@ -39,7 +43,7 @@ public class QrCodeUtils {
             Graphics2D g = bufImg.createGraphics();
             g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
             //使用工具类生成二维码
-            Image image = createQrCode(logoImage, url, 360, 360);
+            Image image = createQrCode(logoResource.getFile().toString(), url, 360, 360);
             //将小图片绘到大图片上,500,300 .表示你的小图片在大图片上的位置。
             g.drawImage(image, 260, 320, null);
             // 设置字体，样式，字体大小

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HandoverRecordController.java

@@ -1,16 +1,24 @@
 package com.fuint.business.order.controller;
 
+import cn.hutool.core.io.resource.InputStreamResource;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.HandoverRecord;
 import com.fuint.business.order.service.HandoverRecordService;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import io.lettuce.core.dynamic.annotation.Param;
 
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.Map;
 
 /**
@@ -118,5 +126,45 @@ public class HandoverRecordController extends BaseController {
         return getSuccessResult(true);
     }
 
+//    @GetMapping("/downloadFile")
+//    public ResponseObject downloadFile() throws IOException {
+//        // 从根目录读取文件，这里仅为示例
+//        File file = new File("path/to/your/file.txt");
+//        InputStreamResource resource = new InputStreamResource(new FileInputStream(file));
+//
+//        HttpHeaders headers = new HttpHeaders();
+//        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName());
+//
+//        return getSuccessResult.ok()
+//                .headers(headers)
+//                .contentLength(file.length())
+//                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+//                .body(resource);
+//    }
+
+    @GetMapping("/downloadFile")
+    public void downloadFile(HttpServletResponse response) throws IOException {
+        File file = new File("CLodop_Setup_for_Win32NT.exe");
+
+        if (!file.exists()) {
+            response.sendError(HttpServletResponse.SC_NOT_FOUND);
+            return;
+        }
+
+        response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + file.getName());
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+        response.setContentLength((int) file.length());
+
+        try (FileInputStream fis = new FileInputStream(file); OutputStream os = response.getOutputStream()) {
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = fis.read(buffer)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java

@@ -264,4 +264,14 @@ public class OilOrderController extends BaseController {
         String orderNo = map.get("orderNo");
         return getSuccessResult(orderService.selectOilOrderDescByOrderNo(orderNo));
     }
+
+    /**
+     * 根据订单id查询油品订单信息（小程序）
+     * @param id
+     * @return
+     */
+    @GetMapping("oilOrderId/{id}")
+    public ResponseObject getOilOrderInfo(@PathVariable Integer id){
+        return getSuccessResult(orderService.selectOilOrderDescByOrderId(id));
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java

@@ -114,4 +114,11 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
     Map<String, String> orderStatistics( @Param("order") OilOrder order);
 
     OilOrderVo selectOilOrderDescByOrderNo(@Param("orderNo") String orderNo);
+
+    /**
+     * 根据订单id查询订单详情信息
+     * @param orderId
+     * @return
+     */
+    OilOrderVo selectOilOrderDescByOrderId(@Param("orderId") Integer orderId);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml

@@ -6,7 +6,7 @@
         select sum(pay_money)
         from all_order_info
         <where>
-            dept_id IN
+            store_id IN
                 <foreach collection="list" item="list" separator="," open="(" close=")">
                     #{list.storeId}
                 </foreach>

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml

@@ -66,6 +66,7 @@
         <include refid="selectOrders"></include>
         <where>
             user_id = #{order.userId}
+            and terminal = 'applet'
             <if test="order.storeId != null and order.storeId != ''">
                 and store_id = #{order.storeId}
             </if>
@@ -529,4 +530,15 @@
             od.order_no = #{orderNo}
         </where>
     </select>
+    <select id="selectOilOrderDescByOrderId" resultType="com.fuint.business.order.vo.OilOrderVo"
+            parameterType="java.lang.Integer">
+        select od.*,ona.oil_name,og.gun_name,sta.real_name,sto.name storeName,sto.description from oil_order od
+        left join oil_name ona on od.oils = ona.id
+        left join oil_gun og on od.oil_gun_num = og.id
+        left join mt_staff sta on od.staff_id = sta.id
+        left join mt_store sto on od.store_id = sto.id
+        <where>
+            od.id = #{orderId}
+        </where>
+    </select>
 </mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java

@@ -144,6 +144,17 @@ public interface OilOrderService extends IService<OilOrder> {
      */
     Map<String, String> orderStatistics(OilOrder order);
 
-
+    /**
+     * 根据订单号查询订单详情信息
+     * @param orderNo
+     * @return
+     */
     OilOrderVo selectOilOrderDescByOrderNo(String orderNo);
+
+    /**
+     * 根据订单id查询订单详情信息
+     * @param orderId
+     * @return
+     */
+    OilOrderVo selectOilOrderDescByOrderId(Integer orderId);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HandoverRecordServiceImpl.java

@@ -454,11 +454,15 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
     }
 
     private static final String LOAD_LIBRARY = "TSCLIB";
+    @Override
+    public void printLocally(Map<String, Object> handover) {
+
+    }
 
     //打印机
 //    private static final String print_model = "58130IVC";
-    @Override
-    public void printLocally(Map<String, Object> handover) {
+//    @Override
+    public void printLocally2(Map<String, Object> handover) {
 
         Map<String, Object> baseInfo = (Map<String, Object>)handover.get("baseInfo");
         Map<String, Object> orderSummary = (Map<String, Object>)handover.get("orderSummary");

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -385,7 +385,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         if (payType.equals("CASH")){
             cashierOrder.setPayAmount(Double.valueOf(map.get("authCode")));
             cashierOrder.setPayTime(new Date());
-            this.insertAllOrderInfo(orderNo,storeId,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid");
+            this.insertAllOrderInfo(orderNo,storeId,oilAmount+goodsAmount,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid");
         }else {
             cashierOrder.setPayAmount(oilActualPay+goodsActualPay);
         }
@@ -697,7 +697,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                         cashierOrder.setSeekZero(0.0);
                         cashierOrder.setPayType(map.get("payType"));
                         cashierOrderService.insertCashierOrder(cashierOrder);
-                        this.insertAllOrderInfo(orderNo, storeId, oilAmount, map.get("payType"), userId, "PC", "1", status);
+                        this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status);
                         staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,oilLiters,"1",orderNo);
                         res.put("success","success");
                     }
@@ -762,7 +762,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                     cashierOrder.setPayType(map.get("payType"));
                     cashierOrderService.insertCashierOrder(cashierOrder);
                     this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
-                    this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"PC","1","paid");
+                    this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid");
                     staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,oilLiters,"1",orderNo);
 //                    this.insertCardBalance(oilAmount,userId,storeId);
                     res.put("success","success");
@@ -780,7 +780,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     /**
      * 添加所有订单信息
      */
-    private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel,String type,String status){
+    private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,Double payAmount,String payType,Integer userId,String payChannel,String type,String status){
         AllOrderInfo allOrderInfo = new AllOrderInfo();
         allOrderInfo.setOrderNo(orderNo);
         allOrderInfo.setType(type);
@@ -791,7 +791,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         allOrderInfo.setPayChannel(payChannel);
         allOrderInfo.setStatus(status);
         if (status.equals("paid")){
-            allOrderInfo.setPayMoney(goodsMoney);
+            allOrderInfo.setPayMoney(payAmount);
             allOrderInfo.setPayTime(new Date());
         }
         if (type.equals("1")){
@@ -914,7 +914,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         oilOrder.setOrderStatus("unpaid");
         oilOrder.setOrderType("主订单");
         oilOrder.setInvoicing("未开票");
-        oilOrder.setRemark("未评价");
         oilOrder.setUserId(nowAccountInfo.getId());
         //        判断当前店铺是否存在此用户的会员信息，没有的话进行添加
         LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
@@ -926,22 +925,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         LJUserVo userVo = userService.selectUserById(oilOrder.getUserId(),oilOrder.getStoreId());
         oilOrder.setPayUser(userVo.getMobile());
         baseMapper.insert(oilOrder);
-
-        //        添加收银台订单信息
-        CashierOrder cashierOrder = new CashierOrder();
-        cashierOrder.setStaffId(oilOrder.getStaffId());
-        cashierOrder.setStoreId(oilOrder.getStoreId());
-        cashierOrder.setPayUser(oilOrder.getPayUser());
-        cashierOrder.setAmount(oilOrder.getOrderAmount());
-        cashierOrder.setPayAmount(oilOrder.getPayAmount());
-        cashierOrder.setStatus("unpaid");
-        cashierOrder.setOrderNo(orderNo);
-        cashierOrder.setOilOrderAmount(oilOrder.getOrderAmount());
-        cashierOrder.setOilDiscountAmount(oilOrder.getDiscountAmount());
-        cashierOrder.setTerminal(oilOrder.getTerminal());
-        cashierOrder.setSeekZero(0.0);
-        cashierOrder.setPayType(oilOrder.getPayType());
-        cashierOrderService.insertCashierOrder(cashierOrder);
         return orderNo;
     }
 
@@ -982,7 +965,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         if (ObjectUtil.isEmpty(storedQuantity) || storedQuantity - oilOrder.getOilNum() <=0){
 //            throw new RuntimeException("油罐容量不足!");
             applet.put("error","油罐容量不足!");
-            this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
+//            this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
             result = true;
         }
         if (isUseChildCard.equals("true")){
@@ -992,7 +975,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             userId = userVo.getId();
             if (!isUseChild.equals("yes")){
                 applet.put("error","不可使用子卡消费!");
-                this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
+                this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),0.0, oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
                 result = true;
             }
         }
@@ -1003,7 +986,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             if (balanceAmount.equals("0") && map.get("payAmount").equals("0")) {
                 if (Double.compare(oilCardLiters,oilOrder.getOilNum())!=0){
                     applet.put("error","囤油卡消费升数不对!");
-                    this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
+                    this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),0.0, oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
                     result = true;
                 }
             }else {
@@ -1011,7 +994,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 Double residueAmount = useLiters * oilNumber.getOilPrice();
                 if ((Double.valueOf(map.get("payAmount"))+Double.valueOf(balanceAmount)-residueAmount)>=0.05){
                     applet.put("error","消费总金额不对!");
-                    this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
+                    this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),0.0, oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
                     result = true;
                 }
             }
@@ -1021,7 +1004,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             Double realAmount = Double.valueOf(map.get("payAmount")) + Double.valueOf(balanceAmount) + Double.valueOf(map.get("discountAmount"));
             if (Double.compare(realAmount,oilOrder.getOrderAmount())!=0){
                 applet.put("error","消费总金额不对!");
-                this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(), oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
+                this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),0.0, oilOrder.getPayType(), userId,oilOrder.getPayType(),"1","payFail");
                 result = true;
             }
         }
@@ -1038,7 +1021,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }
 
 //        判断是否需要调起支付
-        if (!map.get("payAmount").equals("0")) {
+        if (!map.get("payAmount").equals("0") && !map.get("payAmount").equals("0.0") && !map.get("payAmount").equals("0.00")) {
 //        调用支付接口
 //            判断是否开启支付规则
 //            List<MerchantConfig> list = merchantConfigService.selectMeChByIsOpen();
@@ -1080,6 +1063,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             this.updateGrowthValue(oilOrder.getOrderAmount(),payAmount,userId, Integer.valueOf(oilOrder.getOils()),oilCardAmount,oilOrder.getStoreId(),orderNo);
             this.addOilTracks(oilOrder,oilOrder.getStoreId());
             this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount);
+            this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid");
             staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),oilOrder.getOilNum(),"1",orderNo);
             oilOrder.setPayAmount(payAmount);
             oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
@@ -1152,17 +1136,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                 this.updateGrowthValue(oilOrder.getOrderAmount(),oilOrder.getPayAmount(),userId, Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId(),orderNo);
                 this.addOilTracks(oilOrder,oilOrder.getStoreId());
                 staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),oilOrder.getOilNum(),"1",orderNo);
-
-                CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
-                if (ObjectUtil.isNotEmpty(cashierOrder)){
-                    cashierOrder.setOilOrderId(oilOrder.getId());
-                    cashierOrder.setPayTime(new Date());
-                    cashierOrder.setStatus("paid");
-                    cashierOrder.setOilDiscountAmount(oilOrder.getDiscountAmount());
-                    cashierOrder.setPayAmount(oilOrder.getPayAmount());
-                    cashierOrder.setSeekZero(0.0);
-                    cashierOrderService.updateCashierOrder(cashierOrder);
-                }
             }
             row = baseMapper.updateById(oilOrder);
         }
@@ -1638,4 +1611,9 @@ return stringDoubleMap;
     public OilOrderVo selectOilOrderDescByOrderNo(String orderNo) {
         return baseMapper.selectOilOrderDescByOrderNo(orderNo);
     }
+
+    @Override
+    public OilOrderVo selectOilOrderDescByOrderId(Integer orderId) {
+        return baseMapper.selectOilOrderDescByOrderId(orderId);
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java

@@ -4,6 +4,7 @@ import com.fuint.repository.bean.StoreDistanceBean;
 import com.fuint.business.store.entity.MtStore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.system.dept.entity.SysDept;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Mapper
 public interface MtStoreMapper extends BaseMapper<MtStore> {
 
     MtStore queryStoreByName(@Param("name") String name);

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/ExportExcelService.xml

@@ -47,21 +47,10 @@
 
         </where>
     </update>
-    <update id="editStatusBydeptIdList">
-        update mt_store
-         set   status = 'jy'
-        <where>
-            contract_dept_id IN
-            <foreach collection="list" item="list" separator="," open="(" close=")">
-                #{list.deptId}
-            </foreach>
-        </where>
-    </update>
-    <update id="editStatusByExpirationTime">
-        update mt_store
-          set  status = 'jy'
-            where expiration_time > NOW() and  status = 'qy'
-    </update>
+
+
+
+
     <update id="ifDeleteByDeptId" parameterType="java.lang.Long">
         update mt_store
         set if_delete = '1'

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.store.mapper.MtStoreMapper">
+    <update id="editStatusBydeptIdList" parameterType="java.util.List">
+        update mt_store
+        set status = 'jy'
+        where contract_dept_id IN
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item.deptId}
+        </foreach>
+    </update>
+
+    <update id="editStatusByExpirationTime">
+        update mt_store
+        set  status = 'jy'
+        where expiration_time &lt; NOW() and  status = 'qy' and expiration_time is not null
+    </update>
+
+</mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java

@@ -488,6 +488,7 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
     AllOrderInfoMapper allOrderInfoMapper;
     // 将流水上限和时间上限的部门全部设置为不可用
     @Override
+    @Transactional
     public void flowflowConfiguration() {
         // 查询第三方 的所有部门
         LambdaQueryWrapper<SysDept> sysDeptWrapper = Wrappers.lambdaQuery();
@@ -503,8 +504,11 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
                 LambdaQueryWrapper<MtStore> storeWrapper = Wrappers.lambdaQuery();
                 storeWrapper.eq(MtStore::getContractDeptId,sysDeptsList);
                 List<MtStore> mtStores = mtStoreMapper.selectList(storeWrapper);
+                BigDecimal bigDecimal = new BigDecimal("0");
                 // 计算总流水
-                BigDecimal bigDecimal = allOrderInfoMapper.allStream(mtStores);
+                if (ObjectUtil.isNotEmpty(mtStores)) {
+                    bigDecimal = allOrderInfoMapper.allStream(mtStores);
+                }
 
                 if (bigDecimal.compareTo(sysDept.getTurnoverLimit()) >= 0) {
                     // 设置当前部门为禁用
@@ -527,14 +531,13 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
                     // 将有油站设置为未启用
                     mtStoreMapper.editStatusBydeptIdList(sysDeptsList);
                 }
-
-
             }
 
         }
     }
     // 将过期油站设置为不可用
     @Override
+    @Transactional
     public void petrolStationsAreExpired() {
         // 直接修改
         mtStoreMapper.editStatusByExpirationTime();

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/task/QuartzConfig.java

@@ -45,7 +45,8 @@ public class QuartzConfig {
 //                .withIdentity("jyTrigger", "jyTriggerGroup")
 //                //.withSchedule(SimpleScheduleBuilder.simpleSchedule())
 //                .startAt(statTime)  //默认当前时间启动 ,也可以写为：.startNow();
-//                .withSchedule(CronScheduleBuilder.cronSchedule("0/2 * * * * ?")) //两秒执行一次
+//                .withSchedule(CronScheduleBuilder.cronSchedule("0 0 0 * * *")) //0点执行执行一次
+////                .withSchedule(CronScheduleBuilder.cronSchedule("0/2 * * * * ?")) //两秒执行一次
 //                .build();
 
         //5.注册任务和定时器
@@ -56,11 +57,11 @@ public class QuartzConfig {
 //        }
 
         //6.启动 调度器
-        try {
-            scheduler.start();
-        } catch (SchedulerException e) {
-            e.printStackTrace();
-        }
+//        try {
+//            scheduler.start();
+//        } catch (SchedulerException e) {
+//            e.printStackTrace();
+//        }
         log.info("启动时间 ： " + new Date());
 
     }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/task/storeConfigTask.java

@@ -0,0 +1,30 @@
+package com.fuint.business.store.task;
+
+
+import com.fuint.business.store.service.StoreService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+@Slf4j
+public class storeConfigTask {
+
+    @Resource
+    StoreService storeService;
+//    @Scheduled(cron="0/5 * *  * * ? ") // 一秒钟执行一次
+//    @Scheduled(cron="0 * * * * ?") // 一分钟执行一次
+    @Scheduled(cron="0 0 0 * * *")
+    public void storeTask(){
+        log.info("24点，定时任务执行中...(店铺设置禁用)");
+
+        // 将流水上限和时间上限的部门全部设置为不可用
+        storeService.flowflowConfiguration();
+//        // 将过期油站设置为不可用
+        storeService.petrolStationsAreExpired();
+
+    }
+
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/task/streamTask.java

@@ -4,6 +4,7 @@ import com.fuint.business.store.controller.BackendStoreController;
 import com.fuint.business.store.service.StoreService;
 import org.quartz.*;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
 
@@ -19,11 +20,13 @@ public class streamTask implements Job {
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
 
-        // 执行任务的逻辑
-        System.out.println("24点，定时任务执行中...");
-        // 将流水上限和时间上限的部门全部设置为不可用
-        storeService.flowflowConfiguration();
-        // 将过期油站设置为不可用
-        storeService.petrolStationsAreExpired();
+//        // 执行任务的逻辑
+//        System.out.println("24点，定时任务执行中...");
+//        // 将流水上限和时间上限的部门全部设置为不可用
+//        storeService.flowflowConfiguration();
+//        // 将过期油站设置为不可用
+//        storeService.petrolStationsAreExpired();
     }
+
+
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java

@@ -96,7 +96,7 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
             qrCode.setChainStoreId(store.getChainStoreId());
 
 //        带有店铺id 跳转首页
-            qrCode.setCollection("https://www.tuofeng.cc/oilIndex?storeId="+store.getId());
+            qrCode.setCollection("https://www.tuofeng.cc/oilStation?storeId="+store.getId());
 //        带有店铺id 跳转一键加油页面
             qrCode.setPayment("https://www.tuofeng.cc/oilRefuel?storeId="+store.getId());
             row = baseMapper.insert(qrCode);

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/UserBalanceMapper.java

@@ -2,7 +2,9 @@ package com.fuint.business.userManager.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.vo.UserBalanceVo;
 
 public interface UserBalanceMapper extends BaseMapper<UserBalance> {
 
+    int subtractUserBalanceByLock(UserBalanceVo balance);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/UserBalanceMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.userManager.mapper.UserBalanceMapper">
+
+    <update id="subtractUserBalanceByLock">
+        update mt_user_balance
+        <set>
+            <if test="changeCardBalance != null ">
+                card_balance = card_balance - #{changeCardBalance}
+            </if>
+            <if test="changePoints != null ">
+                points = points- #{changePoints}
+            </if>
+            <if test="changeGrowthValue != null ">
+                growth_value = growth_value - #{changeGrowthValue}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+</mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/FixingLevelServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuint.business.userManager.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -77,7 +78,9 @@ public class FixingLevelServiceImpl extends ServiceImpl<FixingLevelMapper, Fixin
      */
     @Override
     public FixingLevel selectFixingLevelByName(String name) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
         queryWrapper.eq("name",name);
         FixingLevel fixingLevel = baseMapper.selectOne(queryWrapper);
         return fixingLevel;
@@ -100,10 +103,16 @@ public class FixingLevelServiceImpl extends ServiceImpl<FixingLevelMapper, Fixin
      */
     @Override
     public int insertFixingLevel(FixingLevel fixingLevel) {
+        int row = 0;
+        FixingLevel fixingLevel1 = this.selectFixingLevelByName(fixingLevel.getName());
+        if (ObjectUtil.isNotEmpty(fixingLevel1)){
+            row = 0;
+            return row;
+        }
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
         fixingLevel.setStoreId(storeId);
-        int row = baseMapper.insert(fixingLevel);
+        row = baseMapper.insert(fixingLevel);
         return row;
     }
 
@@ -114,7 +123,15 @@ public class FixingLevelServiceImpl extends ServiceImpl<FixingLevelMapper, Fixin
      */
     @Override
     public int updateFixingLevel(FixingLevel fixingLevel) {
-        int row = baseMapper.updateById(fixingLevel);
+        int row = 0;
+        List<FixingLevel> fixingLevels = this.selectFixingLevels();
+        for (FixingLevel level : fixingLevels) {
+            if (level.getName().equals(fixingLevel.getName()) && level.getId()!=fixingLevel.getId()){
+                row = 0;
+                return row;
+            }
+        }
+        row = baseMapper.updateById(fixingLevel);
         return row;
     }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java

@@ -10,13 +10,16 @@ import com.fuint.business.userManager.entity.UserBalance;
 import com.fuint.business.userManager.mapper.UserBalanceMapper;
 import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.business.userManager.service.UserBalanceService;
+import com.fuint.business.userManager.vo.UserBalanceVo;
 import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.RedisLock;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 会员储值卡信息 业务层
@@ -52,6 +55,48 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
         return row;
     }
 
+
+
+
+    public int addUserBalanceByLock(UserBalanceVo balance) {
+
+        int row = baseMapper.updateById(balance);
+        return row;
+    }
+
+    @Resource
+    RedisLock redisLock;
+
+    public int subtractUserBalanceByLock(UserBalanceVo balance) {
+        String lockKey = "userChangeBalance"+balance.getMtUserId()+balance.getChainStoreId();
+        Boolean flag = redisLock.tryLock(lockKey, 5001, 5000, TimeUnit.MILLISECONDS);
+        if (flag) {
+            UserBalance userBalance = selectUserBalance(balance.getMtUserId(), balance.getChainStoreId());
+            if (ObjectUtil.isEmpty(userBalance)) throw new RuntimeException("暂无用户信息！");
+            if (ObjectUtil.isNotEmpty(balance.getChangeCardBalance())) {
+                if (balance.getChangeCardBalance().compareTo(userBalance.getCardBalance())>0) {
+                    throw new RuntimeException("用户余额不足！");
+                }
+            }
+            if (ObjectUtil.isNotEmpty(balance.getChangePoints())) {
+                if (balance.getChangeCardBalance().compareTo(userBalance.getCardBalance())>0) {
+                    throw new RuntimeException("用户积分不足！");
+                }
+            }
+            if (ObjectUtil.isNotEmpty(balance.getChangeGrowthValue())) {
+                if (balance.getChangeGrowthValue().compareTo(userBalance.getGrowthValue())>0) {
+                    throw new RuntimeException("用户成长值不足！");
+                }
+            }
+            balance.setId(userBalance.getId());
+            int row = baseMapper.subtractUserBalanceByLock(balance);
+
+            redisLock.unlock(lockKey);
+            return row;
+        }
+        return 0;
+    }
+
     @Override
     public List<UserBalance> selectUserBalance(int userId) {
         QueryWrapper queryWrapper = new QueryWrapper<>();

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/UserBalanceVo.java

@@ -0,0 +1,21 @@
+package com.fuint.business.userManager.vo;
+
+import com.fuint.business.userManager.entity.UserBalance;
+import lombok.Data;
+
+@Data
+public class UserBalanceVo extends UserBalance {
+    /**
+     * 余额变化
+     */
+    private Double changeCardBalance;
+    /**
+     * 积分变化
+     */
+    private Integer changePoints;
+    /**
+     * 成长值变化
+     */
+    private Integer changeGrowthValue;
+
+}

fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/ShiroConfig.java

@@ -63,6 +63,7 @@ public class ShiroConfig {
         filterMap.put("/business/member/staff/queryStaffList/**","anon"); // 获取员工信息
         filterMap.put("/business/indexBanner/list/**","anon"); // 获取员工信息
         filterMap.put("/business/storeInformation/store/queryStores","anon"); // 切换站点
+        filterMap.put("/business/handoverRecord/downloadFile","anon"); // 切换站点
 
 
 

fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/controller/AlipayController.java

@@ -7,7 +7,11 @@ import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.LJUser;
+import com.fuint.business.userManager.entity.LJUserGrade;
+import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.business.userManager.service.LJUserService;
+import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.business.userManager.vo.LJUserVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
@@ -38,6 +42,10 @@ public class AlipayController extends BaseController {
     private LJUserService userService;
     @Autowired
     private ILJStoreService iljStoreService;
+    @Autowired
+    private UserBalanceService userBalanceService;
+    @Autowired
+    private LJUserGradeService ljUserGradeService;
 
     /**
      * 获取支付宝userId
@@ -80,6 +88,25 @@ public class AlipayController extends BaseController {
             userService.addUser(ljUser);
         }
         LJUser ljUser = userService.selectUserByMobile(mobile);
+        // 根据userid和连锁店id查询是否存在对应的余额信息
+        UserBalance userBalance = userBalanceService.selectUserBalance(ljUser.getId(), ljStore.getChainStoreId());
+        if (ObjectUtil.isEmpty(userBalance)) {
+            // 新增余额信息
+            UserBalance userBalanceAdd = new UserBalance();
+            userBalanceAdd.setMtUserId(ljUser.getId());
+            userBalanceAdd.setStoreId(Integer.parseInt(storeId));
+            userBalanceAdd.setChainStoreId(ljStore.getChainStoreId());
+            userBalanceAdd.setCardBalance(0.0);
+            userBalanceAdd.setPoints(0);
+            userBalanceAdd.setGrowthValue(0);
+            userBalanceAdd.setConsumeNum(0);
+            LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeByStoreId(Integer.parseInt(storeId));
+            if (ObjectUtil.isNotEmpty(ljUserGrade) && ObjectUtil.isNotEmpty(ljUserGrade.getId())) {
+                userBalanceAdd.setGradeId(ljUserGrade.getId());
+            }
+            // 新增会员余额信息
+            userBalanceService.insertUserBalance(userBalanceAdd);
+        }
 
         String userAgent = request.getHeader("user-agent");
         AccountInfo accountInfo = new AccountInfo();

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/SysDeptMapper.java

@@ -101,15 +101,15 @@ public interface SysDeptMapper extends BaseMapper<SysDept>
     /**
      * 查询所有过期
      */
-    SysDept selectStatusByTurnoverTime(Long deptId);
+    SysDept selectStatusByTurnoverTime(@Param("deptId") Long deptId);
 
     /**
      * 查询是否过期   直接将过期的部门设置为未启用
      */
     int updateStatusByTurnoverTime();
 
-    int updateStatusById(Long deptId);
+    int updateStatusById(@Param("deptId") Long deptId);
 
-    int updateStatusByList(@Param("sysDeptsList") List<SysDept> sysDeptsList);
+    int updateStatusByList(@Param("list") List<SysDept> sysDeptsList);
 
 }

fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml

@@ -96,9 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 
 	<select id="selectStatusByTurnoverTime" resultType="com.fuint.system.dept.entity.SysDept">
-		select * from sys_dept where turnover_time > NOW() and turnoverType = 2 and status = 'qy'
+		select * from sys_dept where turnover_time > NOW() and turnover_type = 2 and status = 'qy'
 		<if test="deptId != null">
-			dept_id = #{deptId}
+			and dept_id = #{deptId}
 		</if>
 	</select>
 
@@ -108,12 +108,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set status = 'jy' where turnover_time > NOW() and turnoverType = 2
 	</update>
 	<update id="updateStatusById">
-		update sys_dept set status = 'jy' where deptId = #{deptId}
+		update sys_dept set status = 'jy' where dept_id = #{deptId}
 
 	</update>
-
+<!--	where deptId = #{deptId}-->
 	<update id="updateStatusByList">
-		update sys_dept set status = 'jy' where deptId = #{deptId}
+		update sys_dept set status = 'jy'
 		<where>
 			dept_id IN
 			<foreach collection="list" item="list" separator="," open="(" close=")">

fuintCashierWeb/src/api/LodopFuncs.js

@@ -0,0 +1,189 @@
+//==本JS是加载Lodop插件或Web打印服务CLodop/Lodop7的综合示例，可直接使用，建议理解后融入自己程序==
+// http://www.c-lodop.com/LodopDemo.html 地址
+//用双端口加载主JS文件Lodop.js(或CLodopfuncs.js兼容老版本)以防其中某端口被占:
+var MainJS = "CLodopfuncs.js",
+  URL_WS1 = "ws://localhost:8000/" + MainJS,                //ws用8000/18000
+  URL_WS2 = "ws://localhost:18000/" + MainJS,
+  URL_HTTP1 = "http://localhost:8000/" + MainJS,              //http用8000/18000
+  URL_HTTP2 = "http://localhost:18000/" + MainJS,
+  URL_HTTP3 = "https://localhost.lodop.net:8443/" + MainJS;   //https用8000/8443
+
+var CreatedOKLodopObject, CLodopIsLocal, LoadJsState;
+
+//==判断是否需要CLodop(那些不支持插件的浏览器):==
+function needCLodop() {
+  try {
+    var ua = navigator.userAgent;
+    if (ua.match(/Windows\sPhone/i) ||
+      ua.match(/iPhone|iPod|iPad/i) ||
+      ua.match(/Android/i) ||
+      ua.match(/Edge\D?\d+/i))
+      return true;
+    var verTrident = ua.match(/Trident\D?\d+/i);
+    var verIE = ua.match(/MSIE\D?\d+/i);
+    var verOPR = ua.match(/OPR\D?\d+/i);
+    var verFF = ua.match(/Firefox\D?\d+/i);
+    var x64 = ua.match(/x64/i);
+    if ((!verTrident) && (!verIE) && (x64)) return true;
+    else if (verFF) {
+      verFF = verFF[0].match(/\d+/);
+      if ((verFF[0] >= 41) || (x64)) return true;
+    } else if (verOPR) {
+      verOPR = verOPR[0].match(/\d+/);
+      if (verOPR[0] >= 32) return true;
+    } else if ((!verTrident) && (!verIE)) {
+      var verChrome = ua.match(/Chrome\D?\d+/i);
+      if (verChrome) {
+        verChrome = verChrome[0].match(/\d+/);
+        if (verChrome[0] >= 41) return true;
+      }
+    }
+    return false;
+  } catch (err) {
+    return true;
+  }
+}
+
+//==检查加载成功与否，如没成功则用http(s)再试==
+//==低版本CLODOP6.561/Lodop7.043及前)用本方法==
+function checkOrTryHttp() {
+  if (window.getCLodop) {
+    LoadJsState = "complete";
+    return true;
+  }
+  if (LoadJsState == "loadingB" || LoadJsState == "complete") return;
+  LoadJsState = "loadingB";
+  var head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
+  var JS1 = document.createElement("script")
+    , JS2 = document.createElement("script")
+    , JS3 = document.createElement("script");
+  JS1.src = URL_HTTP1;
+  JS2.src = URL_HTTP2;
+  JS3.src = URL_HTTP3;
+  JS1.onload = JS2.onload = JS3.onload = JS2.onerror = JS3.onerror = function () { LoadJsState = "complete"; }
+  JS1.onerror = function (e) {
+    if (window.location.protocol !== 'https:')
+      head.insertBefore(JS2, head.firstChild); else
+      head.insertBefore(JS3, head.firstChild);
+  }
+  head.insertBefore(JS1, head.firstChild);
+}
+
+//==加载Lodop对象的主过程:==
+(function loadCLodop() {
+  if (!needCLodop()) return;
+  CLodopIsLocal = !!((URL_WS1 + URL_WS2).match(/\/\/localho|\/\/127.0.0./i));
+  LoadJsState = "loadingA";
+  if (!window.WebSocket && window.MozWebSocket) window.WebSocket = window.MozWebSocket;
+  //ws方式速度快(小于200ms)且可避免CORS错误,但要求Lodop版本足够新:
+  try {
+    var WSK1 = new WebSocket(URL_WS1);
+    WSK1.onopen = function (e) { setTimeout("checkOrTryHttp();", 200); }
+    WSK1.onmessage = function (e) { if (!window.getCLodop) eval(e.data); }
+    WSK1.onerror = function (e) {
+      var WSK2 = new WebSocket(URL_WS2);
+      WSK2.onopen = function (e) { setTimeout("checkOrTryHttp();", 200); }
+      WSK2.onmessage = function (e) { if (!window.getCLodop) eval(e.data); }
+      WSK2.onerror = function (e) { checkOrTryHttp(); }
+    }
+  } catch (e) {
+    checkOrTryHttp();
+  }
+})();
+
+//==获取LODOP对象主过程,判断是否安装、需否升级:==
+function getLodop(oOBJECT, oEMBED) {
+  var strFontTag = "<br><font color='#FF00FF'>打印控件";
+  var strLodopInstall = strFontTag + "未安装!点击这里<a href='install_lodop32.exe' target='_self'>执行安装</a>";
+  var strLodopUpdate = strFontTag + "需要升级!点击这里<a href='install_lodop32.exe' target='_self'>执行升级</a>";
+  var strLodop64Install = strFontTag + "未安装!点击这里<a href='install_lodop64.exe' target='_self'>执行安装</a>";
+  var strLodop64Update = strFontTag + "需要升级!点击这里<a href='install_lodop64.exe' target='_self'>执行升级</a>";
+  var strCLodopInstallA = "<br><font color='#FF00FF'>Web打印服务CLodop未安装启动，点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>下载执行安装</a>";
+  var strCLodopInstallB = "<br>（若此前已安装过，可<a href='CLodop.protocol:setup' target='_self'>点这里直接再次启动</a>）";
+  var strCLodopUpdate = "<br><font color='#FF00FF'>Web打印服务CLodop需升级!点击这里<a href='CLodop_Setup_for_Win32NT.exe' target='_self'>执行升级</a>";
+  var strLodop7FontTag = "<br><font color='#FF00FF'>Web打印服务Lodop7";
+  var strLodop7HrefX86 = "点击这里<a href='Lodop7_Linux_X86_64.tar.gz' target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+  var strLodop7HrefARM = "点击这里<a href='Lodop7_Linux_ARM64.tar.gz'  target='_self'>下载安装</a>(下载后解压，点击lodop文件开始执行)";
+  var strLodop7Install_X86 = strLodop7FontTag + "未安装启动，" + strLodop7HrefX86;
+  var strLodop7Install_ARM = strLodop7FontTag + "未安装启动，" + strLodop7HrefARM;
+  var strLodop7Update_X86 = strLodop7FontTag + "需升级，" + strLodop7HrefX86;
+  var strLodop7Update_ARM = strLodop7FontTag + "需升级，" + strLodop7HrefARM;
+  var strInstallOK = "，成功后请刷新本页面或重启浏览器。</font>";
+  var LODOP;
+  try {
+    var isWinIE = (/MSIE/i.test(navigator.userAgent)) || (/Trident/i.test(navigator.userAgent));
+    var isWinIE64 = isWinIE && (/x64/i.test(navigator.userAgent));
+    var isLinuxX86 = (/Linux/i.test(navigator.platform)) && (/x86/i.test(navigator.platform));
+    var isLinuxARM = (/Linux/i.test(navigator.platform)) && (/aarch/i.test(navigator.platform));
+
+    if (needCLodop() || isLinuxX86 || isLinuxARM) {
+      try {
+        LODOP = window.getCLodop();
+      } catch (err) { }
+      if (!LODOP && LoadJsState !== "complete") {
+        if (!LoadJsState)
+          alert("未曾加载Lodop主JS文件，请先调用loadCLodop过程."); else
+          alert("网页还没下载完毕，请稍等一下再操作.");
+        return;
+      }
+      var strAlertMessage;
+      if (!LODOP) {
+        if (isLinuxX86)
+          strAlertMessage = strLodop7Install_X86;
+        else if (isLinuxARM)
+          strAlertMessage = strLodop7Install_ARM;
+        else
+          strAlertMessage = strCLodopInstallA + (CLodopIsLocal ? strCLodopInstallB : "");
+        document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
+        return;
+      } else {
+        if (isLinuxX86 && LODOP.CVERSION < "7.0.4.3")
+          strAlertMessage = strLodop7Update_X86;
+        else if (isLinuxARM && LODOP.CVERSION < "7.0.4.3")
+          strAlertMessage = strLodop7Update_ARM;
+        else if (CLODOP.CVERSION < "6.5.7.1")
+          strAlertMessage = strCLodopUpdate;
+
+        if (strAlertMessage)
+          document.body.innerHTML = strAlertMessage + strInstallOK + document.body.innerHTML;
+      }
+      // LODOP.SET_LICENSES("", "EE0887D00FCC7D29375A695F728489A6", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+    } else {
+      //==如果页面有Lodop插件就直接使用,否则新建:==
+      if (oOBJECT || oEMBED) {
+        if (isWinIE)
+          LODOP = oOBJECT;
+        else
+          LODOP = oEMBED;
+      } else if (!CreatedOKLodopObject) {
+        LODOP = document.createElement("object");
+        LODOP.setAttribute("width", 0);
+        LODOP.setAttribute("height", 0);
+        LODOP.setAttribute("style", "position:absolute;left:0px;top:-100px;width:0px;height:0px;");
+        if (isWinIE)
+          LODOP.setAttribute("classid", "clsid:2105C259-1E0C-4534-8141-A753534CB4CA");
+        else
+          LODOP.setAttribute("type", "application/x-print-lodop");
+        document.documentElement.appendChild(LODOP);
+        CreatedOKLodopObject = LODOP;
+      } else
+        LODOP = CreatedOKLodopObject;
+      //==Lodop插件未安装时提示下载地址:==
+      if ((!LODOP) || (!LODOP.VERSION)) {
+        document.body.innerHTML = (isWinIE64 ? strLodop64Install : strLodopInstall) + strInstallOK + document.body.innerHTML;
+        return LODOP;
+      }
+      if (LODOP.VERSION < "6.2.2.6") {
+        document.body.innerHTML = (isWinIE64 ? strLodop64Update : strLodopUpdate) + strInstallOK + document.body.innerHTML;
+      }
+    }
+    //===如下空白位置适合调用统一功能(如注册语句、语言选择等):=======================
+
+    LODOP.SET_LICENSES("", "EE0887D00FCC7D29375A695F728489A6", "C94CEE276DB2187AE6B65D56B3FC2848", "");
+    //===============================================================================
+    return LODOP;
+  } catch (err) {
+    alert("getLodop出错:" + err);
+  }
+}
+export { getLodop };

fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue

@@ -1,9 +1,14 @@
 <!--发票-->
 <template>
   <div class="app-center">
-    <div class="box-center">
+    <div style="float: right;">
+      <span style="font-size: 5px">点击下载打印服务</span>
+      <el-button @click="downloadFile()" type="primary" icon="el-icon-download" circle></el-button>
+
+    </div>
+    <div id="report" ref="report" class="box-center">
       <div class="box-title">交班统计</div>
-      <div class="box-ge">
+      <div class="box-ge" >
         <div class="input-box">
           <div>油站名称:</div>
           <div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.storeName : '未知油站' }}</div>
@@ -378,7 +383,6 @@
         </div>
       </el-card>
     </div>
-
   </div>
 </template>
 
@@ -386,6 +390,8 @@
 import {addHandoverApi, getHandoverApi, printLocallyApi} from "@/api/cashier/handover";
 import BigNumber from "bignumber.js";
 import {removeUserId} from "@/utils/auth";
+import { getLodop } from "@/api/LodopFuncs";
+import Vue from 'vue';
 
     export default {
       name: "Handover",
@@ -496,11 +502,91 @@ import {removeUserId} from "@/utils/auth";
             }
           });
         },
-        printLocally() {
-          printLocallyApi(this.handoverList).then(res=>{
+        async printLocally() {
+          //初始化打印函数
+          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();
+
 
-          })
         },
+
+        downloadFile() {
+          window.location.href = process.env.VUE_APP_SERVER_URL+"business/handoverRecord/downloadFile";
+
+        },
+
+
         // 交班
         async shift() {
           let msg = '交班并退出系统, 是否继续?'
@@ -699,6 +785,32 @@ import {removeUserId} from "@/utils/auth";
 </script>
 
 <style scoped lang="scss">
+#report {
+
+  /* 打印时缩放，防止页面溢出 */
+  //zoom: 0.6;
+
+}
+
+  @media print {
+    @page {
+      //landscape横向,portrait;纵向，如果不设置，则页面有横向和纵向的选择框
+      // size: A4 portrait;
+      //国家标准公文页边距 GB/T 9704-2012
+      // margin: 3.7cm 2.6cm 3.5cm;
+      //margin: 0;
+      //margin: -1mm;
+      //zoom: 0.1;
+
+      /* size: A4 landscape; size: landscape横向，size: portrait;纵向，如果不设置，则页面有横向和纵向的选择框 */
+    }
+    //.cover{
+    //  display: block;
+    //}
+    //
+}
+
+
   .app-center{
     width: 100%;
 

fuintCashierWeb/src/views/cashier/NewComponents/HandoverDetails.vue

@@ -69,11 +69,11 @@
               type="text"
               @click="handleDetail(scope.row)"
             >交班数据</el-button>
-            <el-button
-              size="mini"
-              type="text"
-              @click="printLocally(scope.row.recordData)"
-            >补打交班单</el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              @click="printLocally(scope.row.recordData)"-->
+<!--            >补打交班单</el-button>-->
           </template>
         </el-table-column>
       </el-table>

fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue

@@ -1,10 +1,11 @@
 <!--发票-->
 <template>
   <div class="app-center">
-    <div class="box-center">
+    <el-button style="float: left ;margin-left: 5px"  size="mini"  type="primary" @click="printLocally()"  plain>打印交班单</el-button>
+
+    <div  id="report" ref="report"  class="box-center">
       <div class="box-title">
         交班统计
-        <el-button style="float: right ;margin-left: 5px"  size="mini"  type="primary" @click="printLocally()" plain>打印交班单</el-button>
       </div>
       <div class="box-ge">
         <div class="input-box">
@@ -372,6 +373,7 @@
 <script>
 import {printLocallyApi,addHandoverApis} from "@/api/cashier/handover";
 import BigNumber from "bignumber.js";
+import {getLodop} from "@/api/LodopFuncs";
 
     export default {
       name: "HandoverOnly",
@@ -392,10 +394,85 @@ import BigNumber from "bignumber.js";
       methods: {
 
         printLocally() {
-          console.log("12312312312312312313213122222")
-          printLocallyApi(this.recordData).then(res=>{
+          // const printHTML = document.querySelector('#report').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();
         },
         // getHandover() {
         //   getHandoverApi().then(res=>{
@@ -422,7 +499,7 @@ import BigNumber from "bignumber.js";
           });
         },
 
-        
+
         paymentAggregation(flag) {
           let count = [];
           if (this.handoverList && this.handoverList.paymentAggregation) {

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -446,7 +446,7 @@
           ￥{{ +oilActualPay + (+goodsActualPay) }}
         </div>
         <div style="text-align: center;margin-bottom: 10px">
-          合计金额：{{ oilAmount + goodsAmount }}元、优惠合计{{ oilDiscount + goodsDiscount + fullReduction + couponAmount }}元
+          合计金额：{{ (oilAmount + goodsAmount).toFixed(2) }}元、优惠合计{{ (oilDiscount + goodsDiscount + fullReduction + couponAmount).toFixed(2) }}元
         </div>
         <div v-if="map.payType != 'CASH'">
           <div>
@@ -751,6 +751,38 @@
         <el-button type="primary" @click="addCredit">确 定</el-button>
       </span>
     </el-dialog>
+
+<!--    支付成功后小票打印内容-->
+    <div id="reportSuccess" ref="report" class="box-center" v-show="false">
+      <div class="box-title">订单统计</div>
+      <div class="box-ge">
+        <div class="input-box" v-for="(item,index) in oilOrder" :key="index">
+          <div>{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
+          <div>￥{{ item.amount }}</div>
+        </div>
+        <div class="input-box" v-for="(item,index) in goodsOrder" :key="index">
+          <div>{{ item.name }}</div>
+          <div v-if="isMember == false">{{ item.retailPrice }}</div>
+          <div v-else>{{ item.memberPrice }}</div>
+        </div>
+        <div class="input-box">
+          <div>合计</div>
+          <div>￥{{ oilAmount+(+goodsAmount) }}</div>
+        </div>
+        <div class="input-box" v-if="(oilDiscount + goodsDiscount + fullReduction + couponAmount)>0">
+          <div>优惠合计</div>
+          <div>￥{{ oilDiscount + goodsDiscount + fullReduction + couponAmount }}</div>
+        </div>
+        <div class="input-box">
+          <div>实付款</div>
+          <div>￥{{ (+oilActualPay)+(+goodsActualPay) }}</div>
+        </div>
+        <div class="input-box" v-if="seekZero>0">
+          <div>找零</div>
+          <div>￥{{ seekZero }}</div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -1033,6 +1065,8 @@
         isExistOilOrder:false,
         // 是否存在固定等级会员优惠
         isFixingLevel:false,
+        // 是否为
+        isFixingBalance:false,
         // 查询优惠活动信息所需参数
         preferentialData:{
           userId:"",
@@ -1085,6 +1119,14 @@
       },
     },
     methods:{
+      async printLocally() {
+        const printHTML = document.querySelector('#reportSuccess').innerHTML
+        // 将打印的区域赋值，进行打印
+        window.document.body.innerHTML = printHTML
+        window.print() // 调用window打印方法
+        window.location.reload() // 打印完成后重新加载页面
+
+      },
       clear(){
         this.dialogVisiblej = false
         this.seekZero = 0
@@ -1319,7 +1361,9 @@
           this.countAmountFull();
           this.isUseBalance = false;
         }
-        this.getOilCoupon()
+        if (!this.isFixingLevel){
+          this.getOilCoupon()
+        }
       },
       handleCheckAllChange5(val) {
         if (val){
@@ -1454,7 +1498,7 @@
           _this.gradeDiscount = [];
           if (response.data) {
             _this.oilOrder.forEach(item => {
-              let discount = {type: "", full: 0, reduce: 0, liters: 0}
+              let discount = {type:"",discount:0,oilName:item.oilName,gunName:item.gunName}
               if (item.type == "汽油") {
                 if (response.data.fixingLevel){
                   _this.isFixingLevel = true
@@ -1462,145 +1506,60 @@
                   if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
                     if (response.data.fixingLevel.gasolineDiscount == "满减优惠") {
                       let oilDiscount = 0;
-                      discount.type = "满减优惠"
                       for (let i = 1; i <= gasolineRule.length; i++) {
                         // 将满减条件加入等级优惠列表
                         if (gasolineRule.length > 1) {
                           if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                            discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
                             oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
-                            discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
                             break;
                           }
                           if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
                             oilDiscount = gasolineRule[i - 1].gasolineRule2
-                            discount.reduce = gasolineRule[i - 1].gasolineRule2
                           }
                         } else {
                           if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
                             oilDiscount = gasolineRule[i - 1].gasolineRule2
-                            discount.reduce = gasolineRule[i - 1].gasolineRule2
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('满减优惠')
-                      }
                       gasolineDiscount += +oilDiscount
+                      discount.discount = gasolineDiscount
                     } else if (response.data.fixingLevel.gasolineDiscount == "每升优惠") {
-                      discount.type = "每升优惠"
                       let oilDiscount = 0;
                       for (let i = 1; i <= gasolineRule.length; i++) {
                         // 将满减条件加入等级优惠列表
                         if (gasolineRule.length > 1) {
                           if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                            discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
                             oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                            discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
                             break;
                           }
                           if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
                             oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
                           }
                         } else {
                           if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
                             oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每升优惠')
-                      }
                       gasolineDiscount += +oilDiscount
+                      discount.discount = gasolineDiscount
                     } else {
                       gasolineDiscount = 0;
                     }
                   }
-
-                }else {
-                  if (response.data.userGrade) {
-                    let gasolineRule = JSON.parse(response.data.userGrade.gasolineRule).sort((a, b) => a.gasolineRule1 - b.gasolineRule1);
-                    if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
-                      if (response.data.userGrade.gasolineDiscount == "满减优惠") {
-                        let oilDiscount = 0;
-                        discount.type = "满减优惠"
-                        for (let i = 1; i <= gasolineRule.length; i++) {
-                          // 将满减条件加入等级优惠列表
-                          if (gasolineRule.length > 1) {
-                            if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                              discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
-                              oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
-                              discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
-                              break;
-                            }
-                            if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                              discount.full = gasolineRule[i - 1].gasolineRule1
-                              oilDiscount = gasolineRule[i - 1].gasolineRule2
-                              discount.reduce = gasolineRule[i - 1].gasolineRule2
-                            }
-                          } else {
-                            if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                              discount.full = gasolineRule[i - 1].gasolineRule1
-                              oilDiscount = gasolineRule[i - 1].gasolineRule2
-                              discount.reduce = gasolineRule[i - 1].gasolineRule2
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('满减优惠')
-                        }
-                        gasolineDiscount += +oilDiscount
-                      } else if (response.data.userGrade.gasolineDiscount == "每升优惠") {
-                        discount.type = "每升优惠"
-                        let oilDiscount = 0;
-                        for (let i = 1; i <= gasolineRule.length; i++) {
-                          // 将满减条件加入等级优惠列表
-                          if (gasolineRule.length > 1) {
-                            if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                              discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
-                              oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                              discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                              discount.liters = gasolineRule[i - 1].gasolineRule3
-                              break;
-                            }
-                            if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                              discount.full = gasolineRule[i - 1].gasolineRule1
-                              oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                              discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                              discount.liters = gasolineRule[i - 1].gasolineRule3
-                            }
-                          } else {
-                            if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                              discount.full = gasolineRule[i - 1].gasolineRule1
-                              oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                              discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                              discount.liters = gasolineRule[i - 1].gasolineRule3
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('每升优惠')
-                        }
-                        gasolineDiscount += +oilDiscount
-                      } else {
-                        gasolineDiscount = 0;
-                      }
-                    }
-
-                  }
+                  //
+                  // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+                  //   _this.oilDiscount = 0
+                  //   _this.checkAll4 = false
+                  //   console.log(111)
+                  // }else {
+                    _this.oilDiscount += discount.discount
+                    _this.gradeDiscount.push(discount)
+                    _this.checkAll2 = true
+                    _this.checkedCities2.push(discount.gunName)
+                  //   console.log(222)
+                  // }
                 }
               }
               if (item.type == "柴油") {
@@ -1610,300 +1569,127 @@
                   if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
                     if (response.data.fixingLevel.dieselDiscount == "满减优惠") {
                       let oilDiscount = 0;
-                      discount.type = "满减优惠"
                       for (let i = 1; i <= dieselRule.length; i++) {
                         // 将满减条件加入等级优惠列表
                         if (dieselRule.length > 1) {
                           if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
-                            discount.full = dieselRule[dieselRule.length - 1].dieselRule1
                             oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
-                            discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
                             break;
                           }
                           if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
-                            discount.full = dieselRule[i - 1].dieselRule1
                             oilDiscount = dieselRule[i - 1].dieselRule2
-                            discount.reduce = dieselRule[i - 1].dieselRule2
                           }
                         } else {
-                          discount.full = dieselRule[i - 1].dieselRule1
                           if (item.amount >= dieselRule[i - 1].dieselRule1) {
                             oilDiscount = dieselRule[i - 1].dieselRule2
-                            discount.reduce = dieselRule[i - 1].dieselRule2
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('满减优惠')
-                      }
                       dieselDiscount += +oilDiscount
+                      discount.discount = dieselDiscount
                     } else if (response.data.fixingLevel.dieselDiscount == "每升优惠") {
                       let oilDiscount = 0;
                       for (let i = 1; i <= dieselRule.length; i++) {
-                        discount.type = "每升优惠"
                         // 将满减条件加入等级优惠列表
                         if (dieselRule.length > 1) {
                           if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
-                            discount.full = dieselRule[dieselRule.length - 1].dieselRule1
                             oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
-                            discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
-                            discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
                             break;
                           }
                           if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
-                            discount.full = dieselRule[i - 1].dieselRule1
                             oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.liters = dieselRule[i - 1].dieselRule3
                           }
                         } else {
-                          discount.full = dieselRule[i - 1].dieselRule1
                           if (item.amount >= dieselRule[i - 1].dieselRule1) {
                             oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.liters = dieselRule[i - 1].dieselRule3
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每升优惠')
-                      }
                       dieselDiscount += +oilDiscount
+                      discount.discount = dieselDiscount
                     } else {
                       dieselDiscount = 0;
                     }
                   }
 
-                }else {
-                  if (response.data.userGrade) {
-                    let dieselRule = JSON.parse(response.data.userGrade.dieselRule).sort((a, b) => a.dieselRule1 - b.dieselRule1);
-                    if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
-                      if (response.data.userGrade.dieselDiscount == "满减优惠") {
-                        let oilDiscount = 0;
-                        discount.type = "满减优惠"
-                        for (let i = 1; i <= dieselRule.length; i++) {
-                          // 将满减条件加入等级优惠列表
-                          if (dieselRule.length > 1) {
-                            if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
-                              discount.full = dieselRule[dieselRule.length - 1].dieselRule1
-                              oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
-                              discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
-                              break;
-                            }
-                            if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
-                              discount.full = dieselRule[i - 1].dieselRule1
-                              oilDiscount = dieselRule[i - 1].dieselRule2
-                              discount.reduce = dieselRule[i - 1].dieselRule2
-                            }
-                          } else {
-                            discount.full = dieselRule[i - 1].dieselRule1
-                            if (item.amount >= dieselRule[i - 1].dieselRule1) {
-                              oilDiscount = dieselRule[i - 1].dieselRule2
-                              discount.reduce = dieselRule[i - 1].dieselRule2
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('满减优惠')
-                        }
-                        dieselDiscount += +oilDiscount
-                      } else if (response.data.userGrade.dieselDiscount == "每升优惠") {
-                        let oilDiscount = 0;
-                        for (let i = 1; i <= dieselRule.length; i++) {
-                          discount.type = "每升优惠"
-                          // 将满减条件加入等级优惠列表
-                          if (dieselRule.length > 1) {
-                            if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
-                              discount.full = dieselRule[dieselRule.length - 1].dieselRule1
-                              oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
-                              discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
-                              discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
-                              break;
-                            }
-                            if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
-                              discount.full = dieselRule[i - 1].dieselRule1
-                              oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                              discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                              discount.liters = dieselRule[i - 1].dieselRule3
-                            }
-                          } else {
-                            discount.full = dieselRule[i - 1].dieselRule1
-                            if (item.amount >= dieselRule[i - 1].dieselRule1) {
-                              oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                              discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                              discount.liters = dieselRule[i - 1].dieselRule3
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('每升优惠')
-                        }
-                        dieselDiscount += +oilDiscount
-                      } else {
-                        dieselDiscount = 0;
-                      }
-                    }
-
-                  }
+                  // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+                  //   _this.oilDiscount = 0
+                  //   _this.checkAll4 = false
+                  // }else {
+                    _this.oilDiscount += discount.discount
+                    _this.gradeDiscount.push(discount)
+                    _this.checkAll2 = true
+                    _this.checkedCities2.push(discount.gunName)
+                  // }
                 }
               }
               if (item.type == "天然气") {
                 if (response.data.fixingLevel){
                   _this.isFixingLevel = true
-                  let naturalGasRule = JSON.parse(response.data.fixingLevel.naturalGasRule).sort((a, b) => a.naturalGasRule1 - b.naturalGasRule1);
+                  let naturalGasRule = JSON.parse(response.data.fixingLevel.naturalGasRule).sort((a, b) => a.naturalGas1 - b.naturalGas1);
                   if (response.data.fixingLevel.discountType == '自定义优惠' && response.data.fixingLevel.status == 'qy') {
                     if (response.data.fixingLevel.naturalGasDiscount == "满减优惠") {
                       let oilDiscount = 0;
-                      discount.type = "满减优惠"
                       for (let i = 1; i <= naturalGasRule.length; i++) {
                         // 将满减条件加入等级优惠列表
                         if (naturalGasRule.length > 1) {
-                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                            discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                            oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
-                            discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
+                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGas1) {
+                            oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGas2;
                             break;
                           }
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                            discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+                          if (item.amount >= naturalGasRule[i - 1].naturalGas1 && item.amount < naturalGasRule[i].naturalGas1) {
+                            oilDiscount = naturalGasRule[i - 1].naturalGas2
                           }
                         } else {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                            discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+                          if (item.amount >= naturalGasRule[i - 1].naturalGas1) {
+                            oilDiscount = naturalGasRule[i - 1].naturalGas2
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('满减优惠')
-                      }
                       naturalGasDiscount += +oilDiscount
+                      discount.discount = naturalGasDiscount
                     } else if (response.data.fixingLevel.naturalGasDiscount == "每单位优惠") {
                       let oilDiscount = 0;
-                      discount.type = "每单位优惠"
                       for (let i = 1; i <= naturalGasRule.length; i++) {
                         // 将满减条件加入等级优惠列表
                         if (naturalGasRule.length > 1) {
-                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                            discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                            oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                            discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
+                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGas1) {
+                            oilDiscount = (item.liters * naturalGasRule[naturalGasRule.length - 1].naturalGas3).toFixed(2)
                             break;
                           }
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.liters = naturalGasRule[i - 1].naturalGasRule3
+                          if (item.amount >= naturalGasRule[i - 1].naturalGas1 && item.amount < naturalGasRule[i].naturalGas1) {
+                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGas3).toFixed(2)
                           }
                         } else {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.liters = naturalGasRule[i - 1].naturalGasRule3
+                          if (item.amount >= naturalGasRule[i - 1].naturalGas1) {
+                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGas3).toFixed(2)
                           }
                         }
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每单位优惠')
-                      }
                       naturalGasDiscount += +oilDiscount
+                      discount.discount = naturalGasDiscount
                     } else {
                       naturalGasDiscount = 0;
                     }
                   }
 
-                }else {
-                  if (response.data.userGrade.userGrade) {
-                    let naturalGasRule = JSON.parse(response.data.userGrade.naturalGasRule).sort((a, b) => a.naturalGasRule1 - b.naturalGasRule1);
-                    if (response.data.userGrade.preferential == '自定义优惠' && response.data.userGrade.status == 'qy') {
-                      if (response.data.userGrade.naturalGasDiscount == "满减优惠") {
-                        let oilDiscount = 0;
-                        discount.type = "满减优惠"
-                        for (let i = 1; i <= naturalGasRule.length; i++) {
-                          // 将满减条件加入等级优惠列表
-                          if (naturalGasRule.length > 1) {
-                            if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                              discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                              oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
-                              discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
-                              break;
-                            }
-                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                              oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                              discount.reduce = naturalGasRule[i - 1].naturalGasRule2
-                            }
-                          } else {
-                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                              oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                              discount.reduce = naturalGasRule[i - 1].naturalGasRule2
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('满减优惠')
-                        }
-                        naturalGasDiscount += +oilDiscount
-                      } else if (response.data.userGrade.naturalGasDiscount == "每单位优惠") {
-                        let oilDiscount = 0;
-                        discount.type = "每单位优惠"
-                        for (let i = 1; i <= naturalGasRule.length; i++) {
-                          // 将满减条件加入等级优惠列表
-                          if (naturalGasRule.length > 1) {
-                            if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                              discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                              oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                              discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                              discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
-                              break;
-                            }
-                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                              oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                              discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                              discount.liters = naturalGasRule[i - 1].naturalGasRule3
-                            }
-                          } else {
-                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                              oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                              discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                              discount.liters = naturalGasRule[i - 1].naturalGasRule3
-                            }
-                          }
-                        }
-                        if (discount.reduce != 0) {
-                          _this.gradeDiscount.push(discount)
-                          _this.checkedCities2.push('每单位优惠')
-                        }
-                        naturalGasDiscount += +oilDiscount
-                      } else {
-                        naturalGasDiscount = 0;
-                      }
-                    }
-
-                  }
+                  // if (response.data.fixingLevel.storeValue=="no" && _this.consumeAmount>0){
+                  //   _this.oilDiscount = 0
+                  //   _this.checkAll4 = false
+                  // }else {
+                    _this.oilDiscount += discount.discount
+                    _this.gradeDiscount.push(discount)
+                    _this.checkAll2 = true
+                    _this.checkedCities2.push(discount.gunName)
+                  // }
                 }
+
               }
             })
           }
-          _this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
-          _this.checkAll2 = true;
-          _this.isDefaultUseCard();
+          // _this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
+          // _this.checkAll2 = true;
+          // _this.isDefaultUseCard();
         })
       },
       // 选择会员
@@ -1931,7 +1717,10 @@
         if (this.balance>0){
           this.checkAll4 = true
         }
-        await this.getOilCoupon()
+        await this.getGrade(this.member.id,this.member.gradeId)
+        if (!this.isFixingLevel){
+          await this.getOilCoupon()
+        }
       },
       getOilCoupon(){
         let type = 0;
@@ -1971,7 +1760,7 @@
                 if(!this.isOilStorageCard) {
                   _this.oilDiscount += res.data.memberFavorableAmount
                   _this.checkAll2 = true
-                  this.checkedCities2.push(discount.oilName)
+                  this.checkedCities2.push(discount.gunName)
                 }
               }
               if (res.data.cardFavorableAmount){
@@ -1990,7 +1779,7 @@
                 if(!this.isOilStorageCard) {
                   _this.fullReduction += res.data.activeFavorableAmount
                   _this.checkAll1 = true
-                  this.checkedCities1.push(discount.oilName)
+                  this.checkedCities1.push(discount.gunName)
                 }
               }
             // }
@@ -2392,7 +2181,7 @@
         }
 
         // 校验油罐内油是否足够
-        await getOilTank(this.form.tankId).then(res => {
+        await getOilTank(this.form.tankId).then(async res => {
           if (res.data.storedQuantity-this.form.liters<0){
             this.$modal.msgError("所加油的升数大于油罐内的升数，请重新选择加油升数")
             return;
@@ -2425,7 +2214,10 @@
               if (this.balance>0){
                 this.checkAll4 = true
               }
-              this.getOilCoupon()
+              await this.getGrade(this.member.id,this.member.gradeId)
+              if (!this.isFixingLevel){
+                await this.getOilCoupon()
+              }
             }
           }
         })
@@ -2672,6 +2464,7 @@
                 _this.oilPreferentialData[i].oilPreferential.cardFavorableId = _this.cardFavorableId
                 usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
               }
+              _this.printLocally()
               return;
             }
           }
@@ -2682,6 +2475,7 @@
               _this.seekZero = 0
               _this.amount = 0
               _this.resetting1()
+              _this.printLocally()
               return;
             }
           }
@@ -2801,6 +2595,7 @@
                 _this.isQuery = false;
                 _this.amount = 0
 
+                _this.printLocally()
                 _this.loading = false;
                 if (response.data.oilOrderAmount>0){
                   for (let i =0;i<_this.oilPreferentialData.length;i++){
@@ -3276,6 +3071,14 @@
     /*color: white;*/
   }
 
+  .box-center{
+    width: 100%;
+    //height: 10px;
+    background-color: white;
+    margin: 10px auto;
+    box-sizing: border-box;
+    overflow: auto;
+  }
   .center-left-bottom{
     width: 100%;
     background-color: white;
@@ -3315,6 +3118,20 @@
     margin: 15px 10px ;
   }
 
+  .input-box{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    margin: 5px 0px;
+  }
+  .box-title{
+    font-size: 18px;
+    text-align: center;
+    align-items: center;
+    margin-top: 15px;
+  }
   .bottom-price{
     font-size: 26px;
     font-weight: bold;

fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue

@@ -92,58 +92,47 @@
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="terminal"
-            label="终端"
-            width="100">
+          <el-table-column prop="terminal" label="终端" width="100">
             <template slot-scope="scope">
               <span>{{getType(terminalList,scope.row.terminal)}}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="orderNo"
-            label="订单号"
-            width="220">
-          </el-table-column>
-          <el-table-column
-            prop="amount"
-            label="订单金额">
-          </el-table-column>
-          <el-table-column
-            prop="payAmount"
-            label="实付金额">
-          </el-table-column>
-          <el-table-column label="订单金额组成">
-            <el-table-column
-              prop="oilOrderAmount"
-              label="油品金额">
+          <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
+          <el-table-column label="订单信息" align="center">
+            <el-table-column prop="oilGunNum" label="油品/油枪" align="center" width="120">
+              <template slot-scope="props">
+                <span>{{ getName(oilNameList,props.row.oils) }}/{{ getName1(oilGunList,props.row.oilGunNum) }}</span>
+              </template>
             </el-table-column>
-            <el-table-column
-              prop="goodsOrderAmount"
-              label="商品金额">
+            <el-table-column prop="orderAmount" label="订单金额" align="center" width="120">  </el-table-column>
+            <el-table-column prop="discountAmount" label="优惠金额" align="center" width="120">  </el-table-column>
+
+          </el-table-column>
+          <el-table-column label="付款信息" align="center">
+            <el-table-column prop="payAmount" label="实付金额" align="center" width="120"> </el-table-column>
+            <el-table-column prop="payUser" label="付款用户" align="center" > </el-table-column>
+            <el-table-column prop="payType" label="付款方式" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{getType(payList,scope.row.payType)}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="orderStatus" label="付款状态" align="center" width="120">
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.orderStatus === 'unpaid'">未支付</el-tag>
+                <el-tag type="success" v-else-if="scope.row.orderStatus === 'paid'">已支付</el-tag>
+                <el-tag type="danger" v-else-if="scope.row.orderStatus === 'refund'">已退款</el-tag>
+                <el-tag type="danger" v-else>支付失败</el-tag>
+              </template>
             </el-table-column>
           </el-table-column>
+          <el-table-column prop="invoicing" label="开票标识" align="center" > </el-table-column>
 
-          <el-table-column
-            prop="payUser"
-            label="付款用户">
-          </el-table-column>
-
-          <el-table-column
-            prop="status"
-            label="状态">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
-              <el-tag type="danger" v-else>支付失败</el-tag>
-            </template>
-          </el-table-column>
           <el-table-column label="交易时间" align="center" width="160" prop="payTime">
             <template slot-scope="scope">
               <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
 <!--              <el-button style="width: 60px" size="mini"-->
 <!--                         @click="getOrdersInfo(scope.row.id)"-->
@@ -220,6 +209,9 @@ import {cashierOrder, listCashierOrder, orderStatisticsApi} from "@/api/cashier/
 import {getDicts} from "@/api/dict/data";
 import {queryStaffs} from "@/api/cashier/staff";
 import {exportExcelCashierApi} from "@/api/order/exportExcel";
+import {listOilOrder} from "@/api/cashier/oilorder";
+import {getOilNameList} from "@/api/cashier/oilnumgun";
+import {getOilNumberGun} from "@/api/cashier/oilGuns";
 
   export default {
     name: "order_Cashier",
@@ -260,6 +252,9 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
           theTotalAmountOfOil:'0',
           theTotalAmountOfTheItem:'0',
         },
+        oilNameList:[],
+        oilGunList:[],
+        payList:[],
       }
     },
     created() {
@@ -267,8 +262,30 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
       this.getOrderStatistics();
 
       this.getTerList();
+      this.getOilNameGun();
     },
     methods:{
+      getOilNameGun(){
+        getOilNameList().then( response => {
+          this.oilNameList = response.data;
+        })
+        getDicts("payment_type").then( response => {
+          this.payList = response.data;
+        })
+      },
+      // 获取油枪信息
+      getOilGunList(){
+        getOilNumberGun().then(res => {
+          res.data.forEach(item => {
+            if (item.oilGunList.length>0){
+              item.oilGunList.forEach(i => {
+                i.oilName = item.oilName
+                this.oilGunList.push(i)
+              })
+            }
+          })
+        })
+      },
       exportExcelApplet() {
         exportExcelCashierApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
           const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
@@ -341,7 +358,7 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
           this.queryParams.page = val
         }
         console.log("123123123",this.queryParams)
-        listCashierOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+        listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
           this.list = response.data.records;
           this.total = response.data.total;
         })
@@ -363,6 +380,33 @@ import {exportExcelCashierApi} from "@/api/order/exportExcel";
         // this.resetForm("queryForm");
         this.handleQuery();
       },
+      // 获取油号名称
+      getName(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.oilName;
+              _this.oilType = item.oilType;
+            }
+          })
+        }
+        return name;
+      },
+      // 获取油枪名称
+      getName1(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.gunName;
+            }
+          })
+        }
+        return name;
+      },
     }
   }
 </script>

fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue

@@ -122,10 +122,10 @@
                   <span>{{ props.row.mobile }}</span>
                 </el-form-item>
                 <el-form-item label="操作人">
-                  <span>{{ props.row.realName }}</span>
+                  <span>{{ props.row.realName || "--" }}</span>
                 </el-form-item>
                 <el-form-item label="操作人手机号">
-                  <span>{{ props.row.staffMobile }}</span>
+                  <span>{{ props.row.staffMobile || "--" }}</span>
                 </el-form-item>
                 <el-form-item label="储值优惠">
                   <span>充值满{{ props.row.rechargeBalance }}元赠送{{ props.row.giftBalance }}元</span>
@@ -149,7 +149,11 @@
               <el-tag type="danger" v-else>支付失败</el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="realName" label="交易员工"></el-table-column>
+          <el-table-column prop="realName" label="交易员工">
+            <template slot-scope="scope">
+              <span>{{scope.row.realName || "--"}}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="remark" label="充值备注">
             <template slot-scope="scope">
               <span>{{ scope.row.remark ? scope.row.remark:"--" }}</span>

gasStation-uni/pages/index/index.vue

@@ -187,7 +187,8 @@
 		},
 		onLoad(query) {
 			if (query.storeId) {
-				uni.setStorageSync("y_storeId", query.storeId)
+				// uni.setStorageSync("y_storeId", query.storeId)
+				uni.setStorageSync("storeId", query.storeId)
 			}
 			if (query.type) {
 				uni.setStorageSync("y_type", query.type)
@@ -220,9 +221,6 @@
 				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
-				})
 				this.getUserAuthority();
 				this.getOilType();
 			} else {
@@ -409,9 +407,7 @@
 						})
 					}
 				}).catch((res) => {
-					uni.showLoading({
-						title: res + "---" + 1
-					})
+					
 				})
 			},
 			// 获取当前位置
@@ -443,8 +439,8 @@
 								.toFixed(1)
 							_this.store = response.data.store
 							uni.setStorageSync("storeId", response.data.store.id)
-							uni.setStorageSync("chainStoreId", response.data.store
-								.chainStoreId)
+							uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
+								// console.log(uni.getStorageSync("chainStoreId"));
 							let welfare = response.data.store.welfare
 							if (welfare) {
 								if (welfare.includes(",")) {

gasStation-uni/pages/refuel/refuel.vue

@@ -243,6 +243,8 @@
 					_this.getStaffList(id)
 					_this.store = res.data
 					_this.storeId = res.data.id;
+					uni.setStorageSync("storeId", _this.store.id)
+					uni.setStorageSync("chainStoreId", _this.store.chainStoreId)
 					let welfare = res.data.welfare
 					if (welfare) {
 						if (welfare.includes(",")) {

gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue

@@ -20,7 +20,7 @@
 
 				<view class="t-b-box">
 					<view class="goodsimg">
-						<image :src="baseUrl+form.coverImage"  mode="aspectFit"></image>
+						<image :src="baseUrl+form.coverImage" mode="aspectFit"></image>
 					</view>
 					<view class="right-r-box">
 						<view class="-title">{{form.giftName}}</view>
@@ -51,7 +51,7 @@
 
 					<view class="right-size" v-if="form.shippingType == '物流配送'">
 
-						<span>{{form.courierCompanies}}:{{form.theTrackingNumber}}</span>
+						<span>{{form.courierCompanies?form.courierCompanies:'暂无物流信息'}}:{{form.theTrackingNumber?form.theTrackingNumber:''}}</span>
 					</view>
 					<view v-else class="right-size">门店自提</view>
 				</view>
@@ -75,7 +75,7 @@
 					</u-steps-item>
 					<u-steps-item title="已发货" :desc="form.shippingTime?form.shippingTime:'--'">
 					</u-steps-item>
-					<u-steps-item title="运输中"></u-steps-item>
+					<u-steps-item :title="this.form.orderStatus"></u-steps-item>
 				</u-steps>
 			</view>
 
@@ -106,7 +106,8 @@
 					shippingType: '',
 					amount: '',
 					courierCompanies: '',
-					theTrackingNumber: ''
+					theTrackingNumber: '',
+					orderStatus: ''
 
 				}
 			}
@@ -118,6 +119,8 @@
 		onShow() {
 			uni.$on('pointsGoodsDetails', (data) => {
 				this.pointsGoodsDetails = data
+
+				console.log("this.pointsGoodsDetails", this.pointsGoodsDetails)
 				if (this.pointsGoodsDetails != null) {
 					// this.dataProcessing()
 					this.form.orderNumber = this.pointsGoodsDetails.orderNumber
@@ -132,6 +135,7 @@
 					this.form.shippingType = this.pointsGoodsDetails.shippingType
 					this.form.courierCompanies = this.pointsGoodsDetails.courierCompanies
 					this.form.theTrackingNumber = this.pointsGoodsDetails.theTrackingNumber
+					this.form.orderStatus = this.pointsGoodsDetails.orderStatus
 
 					// 当前订单状态
 					if (this.pointsGoodsDetails.orderStatus) {

gasStation-uni/pagesHome/PointsMall/PointsMall.vue

@@ -19,7 +19,7 @@
 						</view>
 					</view>
 					<view class="tp">
-						<image src="../../static/imgs/hby.png"  mode="aspectFit"></image>
+						<image src="../../static/imgs/hby.png" mode="aspectFit"></image>
 					</view>
 
 				</view>
@@ -70,15 +70,18 @@
 						<view class="box-goods" v-for="(item,index) in integralGiftList" :key="index"
 							@click="godetails(item)">
 							<view class="goods-img">
-								<image :src="baseUrl+item.coverImage"  mode="aspectFit"></image>
+								<image :src="baseUrl+item.coverImage" mode="aspectFit"></image>
 							</view>
 							<view class="goods-title">
 								{{item.giftName}}
 							</view>
+							<view class="hui-time">
+								库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}
+							</view>
 							<view class="good-red">
 								<view style="display: flex;align-items: center;">
 									<view class="bi" v-if="item.exchangeMethod != '金额'">
-										<image src="../../static/imgs/jb.png"  mode="aspectFit"></image>
+										<image src="../../static/imgs/jb.png" mode="aspectFit"></image>
 									</view>
 									<view style="color: #FC1708;font-weight: bold;">
 										<span
@@ -88,9 +91,7 @@
 											v-if="item.exchangeMethod == '金额' || item.exchangeMethod == '积分+金额'">￥{{item.exchangeAmount}}</span>
 									</view>
 								</view>
-								<view class="hui-time">
-									库存:{{item.remainingInventory === -1?"不限":item.remainingInventory}}
-								</view>
+
 							</view>
 							<view class="anniux">
 								<text v-if="!item.remainingInventory || item.remainingInventory==0"

gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue

@@ -22,11 +22,11 @@
 			<view class="goods-box" v-for="(item,index) in orderList" :key="item.id" @click="orderDetails(item)">
 				<view class="goods-top">
 					<view class="goods-img">
-						<image :src="baseUrl+item.coverImage"  mode="aspectFit"></image>
+						<image :src="baseUrl+item.coverImage" mode="aspectFit"></image>
 					</view>
 					<view class="nr-tip">
 						<view class="title-s">{{item.giftName}}</view>
-						<view class="hui-s">{{item.createTime}}</view>
+						<view class="hui-s">{{item.createTime}} {{item.orderType==0?"（商城兑换）":"（积分兑换）"}}</view>
 						<view class="right-size">
 							<view class="jg">
 								{{item.amount?"￥"+item.amount:''}}

gasStation-uni/pagesHome/order/order.vue

@@ -17,7 +17,7 @@
 				<view class="dis">
 					<!-- <uni-icons type="location-filled" size="20"></uni-icons> -->
 					<view class="boximg">
-						<image :src="logo?baseUrl+logo:'../../static/logo.png'"  mode="aspectFit"></image>
+						<image :src="logo?baseUrl+logo:'../../static/logo.png'" mode="aspectFit"></image>
 					</view>
 					<view class="">
 						<view class="">{{storeName}}</view>
@@ -35,14 +35,20 @@
 				<view class="dis">
 					<uni-icons type="location-filled" color="#666666" size="30" style="margin-right: 5px;"></uni-icons>
 
-					<view class="">
-						<view class="">家庭住址</view>
+					<view v-if="addrInfo" class="">
+						<view class="">{{addrInfo.name}}--{{addrInfo.mobile}}</view>
 						<view class="hui-time">
 							<!-- 山东省济南市槐荫区兴福路 -->
 							{{addrInfo.address}}
 						</view>
 					</view>
 
+					<view v-else class="">
+						<view class="">请选择家庭住址</view>
+						<!-- 		<view class="hui-time">
+						</view> -->
+					</view>
+
 				</view>
 				<view class="">
 					<uni-icons type="right" size="20"></uni-icons>
@@ -52,7 +58,7 @@
 			<view class="box-bait">
 				<view class="dis-box">
 					<view class="goodsimg">
-						<image :src='baseUrl+goodsInfo.coverImage'  mode="aspectFit"></image>
+						<image :src='baseUrl+goodsInfo.coverImage' mode="aspectFit"></image>
 					</view>
 					<view class="">
 						<view class="">{{goodsInfo.giftName}}</view>
@@ -215,6 +221,12 @@
 					return
 				}
 
+				if (_this.appltType == "WECHAT") {
+					_this.paymentType = "WECHAT"
+				} else {
+					_this.paymentType = "ALIPAY"
+				}
+
 				let integralOrders = {
 					giftId: this.goodsInfo.id,
 					amount: _this.allAmout,
@@ -228,8 +240,8 @@
 
 				}
 				if (this.shippingType == "物流配送") {
-					if (addrInfo) {
-						integralOrders.addressId = addrInfo.id
+					if (this.addrInfo) {
+						integralOrders.addressId = this.addrInfo.id
 					} else {
 						uni.showToast({
 							title: "请填写配送信息!",
@@ -360,7 +372,6 @@
 				// let flag = await this.checkTheRedemptionLimit(this.goodsInfo.id)
 				let flag = await this.enquiryForCollection(this.goodsInfo.id)
 				let num = e.value + Number(flag)
-				console.log("123123", num);
 				//判断库存
 				if (num > this.goodsInfo.exchangeTimes) {
 					uni.showToast({
@@ -368,9 +379,6 @@
 						icon: "none"
 					})
 
-
-					console.log("exchangeTimes", this.goodsInfo.exchangeTimes)
-					console.log("flag", flag)
 					e.value = this.goodsInfo.exchangeTimes - flag
 					this.value = this.goodsInfo.exchangeTimes - flag
 
@@ -394,17 +402,23 @@
 					this.flag = true
 					this.allData()
 				} else {
+					this.flag = false
+
 					this.value = e.value
 					this.allData()
 				}
 
 			},
+
+
 			transferIndex(index) {
 				// this.qhindex = index
 
 				const deliveryData = JSON.parse(this.goodsInfo.deliveryMethod);
 				console.log("deliveryData", deliveryData)
 				if (deliveryData.length >= 2) {
+					deliveryData[0] = '门店自提'
+					deliveryData[1] = '物流配送'
 					this.shippingType = deliveryData[index]
 					this.qhindex = index
 				} else if (deliveryData[0] == '门店自提') {
@@ -454,8 +468,6 @@
 
 				) {
 
-					console.log("11111111")
-
 					this.allAmout = this.goodsInfo.shippingFeeAmount
 				}
 				console.log("allAmout", this.allAmout)
@@ -514,8 +526,8 @@
 
 
 
-			getAddr() {
-				request({
+			async getAddr() {
+				await request({
 					url: 'business/userManager/mtUserExpressAddress/getList',
 					method: 'get',
 				}).then((res) => {

gasStation-uni/pagesLogin/login/login.vue

@@ -86,13 +86,13 @@
 									method: 'post',
 									data: {
 										authCode: authCode,
-										storeId: 0,
+										storeId: uni.getStorageSync("storeId"),
 										staffId: "",
 										phone: "18457621459",
 										encryptedData: encryptedData,
 									},
 								}).then((resp) => {
-									console.log(resp)
+									// console.log(resp)
 									if (resp.code == 200) {
 
 										uni.setStorageSync('App-Token', resp.data.token);
@@ -210,7 +210,8 @@
 					url: "clientApi/sign/alipayLogin/getUserid",
 					method: 'post',
 					data: {
-						storeId: uni.getStorageSync("y_storeId"),
+						storeId: uni.getStorageSync("storeId"),
+						// storeId: uni.getStorageSync("y_storeId"),
 						type: uni.getStorageSync("y_type"),
 						userId: uni.getStorageSync("y_userId"),
 					},

gasStation-uni/pagesMy/comment/comment.vue

@@ -13,20 +13,21 @@
 				<view class="c-box-top">您对工作人员满意吗</view>
 				<view class="dis">
 					<view class="touxiang">
-						<image src="../../static/imgs/myx.png"  mode="aspectFit"></image>
+						<image v-if="user.avatar" :src="baseUrl + user.avatar"  mode="aspectFit"></image>
+						<image v-else src="../../static/imgs/myx.png"  mode="aspectFit"></image>
 					</view>
 					<view class="">
-						<view class="username">username(13583017106)</view>
+						<view class="username">{{user.name?user.name:"未填写"}}({{user.mobile}})</view>
 						<view class="">
 							<u-rate active-color="#ffd74e" :count="count" v-model="value"></u-rate>
 						</view>
 					</view>
 				</view>
-				<view class="wrap-box">
+				<!-- <view class="wrap-box">
 					<view class="w-box" v-for="(item,index) in textlist" :key="index" @click="textindex">
 						{{item.text || "下次还来"}}
 					</view>
-				</view>
+				</view> -->
 				<u--textarea v-model="value1" placeholder="请输入内容"></u--textarea>
 			</view>
 			<view class="anniu">
@@ -38,13 +39,14 @@
 </template>
 
 <script>
+	import request from "../../utils/request";
 	export default {
 		data() {
 			return {
 				title: '',
 				description: '您的宝贵建议，就是我们前进的动力~动动手指，帮助我们做得更好~~',
-				count: 10,
-				value: 2,
+				count: 5,
+				value: 0,
 				value1: '',
 				textlist: [{
 						text: '外瑞古德'
@@ -67,16 +69,30 @@
 					{
 						text: ''
 					},
-				]
-
-
+				],
+				user:{},
+				// url信息
+				baseUrl: this.$baseUrl,
 			}
 		},
-
+		onShow() {
+			this.getUser()
+		},
 		components: {
 
 		},
 		methods: {
+			// 查询当前登录用户信息
+			getUser(){
+				request({
+					url: 'business/userManager/user/getUser',
+					method: 'get',
+				}).then(res => {
+					if (res.data) {
+						this.user = res.data
+					}
+				})
+			},
 			goback() {
 				uni.navigateBack()
 			}

gasStation-uni/pagesMy/details/details.vue

@@ -9,49 +9,58 @@
 			</view>
 			<!-- 顶部区域 -->
 			<view class="top-size">
-				<view style="font-weight: bold;margin-bottom: 5px;">已支付订单</view>
-				<view class="">如果有疑问请向客户进行资讯</view>
+				<!-- <view style="font-weight: bold;margin-bottom: 5px;">已支付订单</view> -->
+				<view style="font-weight: bold;margin-bottom: 5px;" v-if="oilOrder.orderStatus=='paid'">已支付订单</view>
+				<view style="font-weight: bold;margin-bottom: 5px;" v-else-if="oilOrder.orderStatus=='payFail'">支付失败订单</view>
+				<view style="font-weight: bold;margin-bottom: 5px;" v-else-if="oilOrder.orderStatus=='refund'">已退款订单</view>
+				<view style="font-weight: bold;margin-bottom: 5px;" v-else-if="oilOrder.orderStatus=='refunding'">退款中订单</view>
+				<view style="font-weight: bold;margin-bottom: 5px;" v-else>未支付订单</view>
+				<view class="">如果有疑问请向商家进行咨询</view>
 			</view>
 			<view class="centen-box">
 				<view class="box-title">订单信息</view>
 				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<view class="hui-size">油站名称</view>
+					<view class="">{{oilOrder.storeName}}{{oilOrder.description ? "("+oilOrder.description+")" : ""}}</view>
+				</view>
+				<view class="dis-fx">
+					<view class="hui-size">加油员工</view>
+					<view class="">{{oilOrder.realName}}</view>
 				</view>
 				<view class="dis-fx">
 					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<view class="">{{oilOrder.oilName}}/{{oilOrder.gunName}}</view>
 				</view>
 				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
-				</view>
-				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<view class="hui-size">油品单价</view>
+					<view class="">￥{{oilPrice}}/L</view>
 				</view>
 				<view class="box-title">加油信息</view>
 				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<view class="hui-size">加油金额</view>
+					<view class="">{{oilOrder.orderAmount}}元</view>
 				</view>
 				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
-				</view>
-				<view class="box-title">优惠信息</view>
-				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<view class="hui-size">实付金额</view>
+					<view class="">{{oilOrder.payAmount}}元</view>
 				</view>
 				<view class="dis-fx">
-					<view class="hui-size">油号油枪</view>
-					<view class="">92#/1号枪</view>
+					<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>
-			<view class="anniu" @click="gocomment()">
-				<text>评价有礼</text>
+			<view class="anniu" v-if="oilOrder.orderStatus=='paid' && oilOrder.remark" @click="gocomment()">
+				<text>去评价</text>
 			</view>
 
 
@@ -60,19 +69,50 @@
 </template>
 
 <script>
+	import request from '../../utils/request'
 	export default {
 		data() {
 			return {
 				title: '',
-
-
+				orderId:"",
+				oilOrder:{},
+				oilPrice:"",
 			}
 		},
-
+		onLoad(e) {
+			this.orderId = e.orderId
+			this.getOilOrder()
+		},
 		components: {
 
 		},
 		methods: {
+			// 获取油品订单
+			getOilOrder() {
+				request({
+					url: "business/oilOrder/oilOrderId/" + this.orderId,
+					method: 'get',
+				}).then((res) => {
+					if(res.data){
+						this.oilOrder = res.data
+						this.getOilNumber(res.data.storeId)
+					}
+				})
+			},
+			// 获取当前店铺油号信息
+			getOilNumber(storeId) {
+				let _this = this;
+				request({
+					url: "business/petrolStationManagement/oilNumber/getOilNumberName/" + storeId,
+					method: 'get',
+				}).then((res) => {
+					res.data.forEach(item => {
+						if (item.oilName == _this.oilOrder.oils) {
+							_this.oilPrice = item.oilPrice;
+						}
+					})
+				})
+			},
 			gocomment() {
 				uni.navigateTo({
 					url: '/pagesMy/comment/comment'

gasStation-uni/pagesMy/myorder/myorder.vue

@@ -28,7 +28,7 @@
 					@scrolltolower="scrolltolower">
 					<!-- 油品订单列表 -->
 					<view class="box-order" v-for="(item,index) in list" :key="index">
-						<view class="or-box-top">
+						<view class="or-box-top" @click="goOrderInfo(item.id)">
 							<view class="">{{getStoreName(storeList,item.storeId)}}</view>
 							<!-- <view class="chengg">{{getPayName(payList,item.orderStatus)}}</view> -->
 							<view class="chengg" v-if="item.orderStatus=='paid'">已支付</view>
@@ -42,22 +42,22 @@
 							<view class="huis">订单类型</view>
 							<view class="">油品订单</view>
 						</view> -->
-						<view class="but-box">
+						<view class="but-box" @click="goOrderInfo(item.id)">
 							<view class="huis">订单金额</view>
 							<view class="">￥{{item.orderAmount}}</view>
 						</view>
-						<view class="but-box">
+						<view class="but-box" @click="goOrderInfo(item.id)">
 							<view class="huis">优惠合计</view>
 							<view class="reds">￥{{item.discountAmount}}</view>
 						</view>
-						<view class="but-box">
+						<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-else>{{item.createTime}}</view>
 						</view>
-						<view v-if="item.orderStatus=='paid'" class="end-box" @click="goComment()">
+						<view v-if="item.orderStatus=='paid' && item.remark" class="end-box" @click="goComment()">
 							<view class="anniu">
-								<text>评价有礼</text>
+								<text>去评价</text>
 							</view>
 						</view>
 						<view v-else-if="item.orderStatus=='unpaid'" class="end-box" @click="goPayment(item.orderNo)">
@@ -391,7 +391,7 @@
 						pageSize: 10,
 						storeId: "",
 						orderStatus: "paid",
-						remark: "",
+						remark: "1",
 						payType:uni.getStorageSync("appltType")
 					}
 					this.getMyOrder()
@@ -408,6 +408,11 @@
 					url: '/pagesRefuel/orderDetail/index?orderNo=' + orderNo,
 				})
 			},
+			goOrderInfo(orderId){
+				uni.navigateTo({
+					url: '/pagesMy/details/details?orderId=' + orderId,
+				})
+			},
 			goComment() {
 				uni.navigateTo({
 					url: "/pagesMy/comment/comment"

gasStation-uni/pagesRefuel/orderDetail/index.vue

@@ -98,7 +98,7 @@
 					</view>
 				</view>
 				
-				<view class="desc" v-if="preferentialData.memberFavorableAmount">
+				<view class="desc" v-if="gradeRedece>0">
 					<view style="display: flex;">
 						会员等级优惠
 						<!-- <span style="display: flex;">({{userGrade.name}})</span> -->
@@ -246,11 +246,13 @@
 					memberFavorableAmount: "",
 					type: "",
 				},
+				// 是否为固定等级会员
+				isFixingLevel:false,
 			}
 		},
 		onLoad(e) {
 			this.orderNo = e.orderNo
-			// this.orderNo = "23452024012011401299130f"
+			// this.orderNo = "234520240124103747dec173"
 		},
 		onShow() {
 			this.getOilOrder();
@@ -279,7 +281,9 @@
 					};
 				}else{
 					this.oilCardRedece = 0
-					this.getPaymentPreferential(this.user.gradeId)
+					if (!this.isFixingLevel){
+						this.getPaymentPreferential(this.user.gradeId)
+					}
 				}
 			},
 			
@@ -320,6 +324,7 @@
 							title:res.data.error,
 							icon:"none"
 						})
+						// _this.goBack()
 						return;
 					}
 					if(res.data.success == "ok"){
@@ -461,7 +466,9 @@
 					// this.chooseGrade(this.user.id,this.user.gradeId)
 				}
 				if (this.oilCardRedece==0){
-					this.getPaymentPreferential(this.user.gradeId)
+					if (!this.isFixingLevel){
+						this.getPaymentPreferential(this.user.gradeId)
+					}
 				}
 			},
 			// 查看是否有可使用的储值卡金额
@@ -517,18 +524,18 @@
 									if (res.data.fixingLevel.gasolineDiscount == "满减优惠"){
 										if (gasolineRule.length > 1){
 											for (let i = 1; i<gasolineRule.length; i++){
-												if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
+												if (that.oilOrder.orderAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
 													that.gradeRedece = gasolineRule[gasolineRule.length-1].gasolineRule2
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= gasolineRule[i - 1].gasolineRule1 && that.deductAmount < gasolineRule[i].gasolineRule1) {
+												if (that.oilOrder.orderAmount >= gasolineRule[i - 1].gasolineRule1 && that.oilOrder.orderAmount < gasolineRule[i].gasolineRule1) {
 													that.gradeRedece = gasolineRule[i - 1].gasolineRule2
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
+											if (that.oilOrder.orderAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
 												that.gradeRedece = gasolineRule[gasolineRule.length-1].gasolineRule2
 												that.isGradePreferential = true
 											}
@@ -537,20 +544,20 @@
 									if (res.data.fixingLevel.gasolineDiscount == "每升优惠"){
 										if (gasolineRule.length > 1){
 											for (let i = 1; i<gasolineRule.length; i++){
-												if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
+												if (that.oilOrder.orderAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
 													// 计算升数 和 优惠金额
-													that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= gasolineRule[i - 1].gasolineRule1 && that.deductAmount < gasolineRule[i].gasolineRule1) {
-													that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+												if (that.oilOrder.orderAmount >= gasolineRule[i - 1].gasolineRule1 && that.oilOrder.orderAmount < gasolineRule[i].gasolineRule1) {
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * gasolineRule[i - 1].gasolineRule3).toFixed(2)
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
-												that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
+											if (that.oilOrder.orderAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
+												that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
 												that.isGradePreferential = true
 											}
 										}
@@ -562,18 +569,18 @@
 									if (res.data.fixingLevel.dieselDiscount == "满减优惠"){
 										if (dieselRule.length > 1){
 											for (let i = 1; i<dieselRule.length; i++){
-												if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
+												if (that.oilOrder.orderAmount >= dieselRule[dieselRule.length-1].dieselRule1){
 													that.gradeRedece = dieselRule[dieselRule.length-1].dieselRule2
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= dieselRule[i - 1].dieselRule1 && that.deductAmount < dieselRule[i].dieselRule1) {
+												if (that.oilOrder.orderAmount >= dieselRule[i - 1].dieselRule1 && that.oilOrder.orderAmount < dieselRule[i].dieselRule1) {
 													that.gradeRedece = dieselRule[i - 1].dieselRule2
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
+											if (that.oilOrder.orderAmount >= dieselRule[dieselRule.length-1].dieselRule1){
 												that.gradeRedece = dieselRule[dieselRule.length-1].dieselRule2
 												that.isGradePreferential = true
 											}
@@ -582,20 +589,20 @@
 									if (res.data.fixingLevel.dieselDiscount == "每升优惠"){
 										if (dieselRule.length > 1){
 											for (let i = 1; i<dieselRule.length; i++){
-												if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
+												if (that.oilOrder.orderAmount >= dieselRule[dieselRule.length-1].dieselRule1){
 													// 计算升数 和 优惠金额
-													that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= dieselRule[i - 1].dieselRule1 && that.deductAmount < dieselRule[i].dieselRule1) {
-													that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[i - 1].dieselRule3).toFixed(2)
+												if (that.oilOrder.orderAmount >= dieselRule[i - 1].dieselRule1 && that.oilOrder.orderAmount < dieselRule[i].dieselRule1) {
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * dieselRule[i - 1].dieselRule3).toFixed(2)
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
-												that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
+											if (that.oilOrder.orderAmount >= dieselRule[dieselRule.length-1].dieselRule1){
+												that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
 												that.isGradePreferential = true
 											}
 										}
@@ -607,18 +614,18 @@
 									if (res.data.fixingLevel.naturalGasDiscount == "满减优惠"){
 										if (naturalGasRule.length > 1){
 											for (let i = 1; i<naturalGasRule.length; i++){
-												if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
+												if (that.oilOrder.orderAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
 													that.gradeRedece = naturalGasRule[naturalGasRule.length-1].naturalGasRule2
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.deductAmount < naturalGasRule[i].naturalGasRule1) {
+												if (that.oilOrder.orderAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.oilOrder.orderAmount < naturalGasRule[i].naturalGasRule1) {
 													that.gradeRedece = naturalGasRule[i - 1].naturalGasRule2
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
+											if (that.oilOrder.orderAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
 												that.gradeRedece = naturalGasRule[naturalGasRule.length-1].naturalGasRule2
 												that.isGradePreferential = true
 											}
@@ -627,172 +634,32 @@
 									if (res.data.fixingLevel.naturalGasDiscount == "每升优惠"){
 										if (naturalGasRule.length > 1){
 											for (let i = 1; i<naturalGasRule.length; i++){
-												if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
+												if (that.oilOrder.orderAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
 													// 计算升数 和 优惠金额
-													that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
 													that.isGradePreferential = true
 													break;
 												}
-												if (that.deductAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.deductAmount < naturalGasRule[i].naturalGasRule1) {
-													that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+												if (that.oilOrder.orderAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.oilOrder.orderAmount < naturalGasRule[i].naturalGasRule1) {
+													that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
 													that.isGradePreferential = true
 												}
 											}
 										}else{
-											if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
-												that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
+											if (that.oilOrder.orderAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
+												that.gradeRedece = (that.oilOrder.orderAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
 												that.isGradePreferential = true
 											}
 										}
 									}
 								}
 							}
-						}else{
-							if(res.data.userGrade){
-								that.userGrade = res.data.userGrade
-								that.chooseFullOrCoupon();
-								if (res.data.userGrade.preferential== "自定义优惠"){
-									if (that.oilType == "汽油"){
-										// 将数组按照金额从小到大排序
-										let gasolineRule = JSON.parse(res.data.userGrade.gasolineRule).sort((a,b) => a.gasolineRule1 - b.gasolineRule1);
-										if (res.data.userGrade.gasolineDiscount == "满减优惠"){
-											if (gasolineRule.length > 1){
-												for (let i = 1; i<gasolineRule.length; i++){
-													if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
-														that.gradeRedece = gasolineRule[gasolineRule.length-1].gasolineRule2
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= gasolineRule[i - 1].gasolineRule1 && that.deductAmount < gasolineRule[i].gasolineRule1) {
-														that.gradeRedece = gasolineRule[i - 1].gasolineRule2
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
-													that.gradeRedece = gasolineRule[gasolineRule.length-1].gasolineRule2
-													that.isGradePreferential = true
-												}
-											}
-										}
-										if (res.data.userGrade.gasolineDiscount == "每升优惠"){
-											if (gasolineRule.length > 1){
-												for (let i = 1; i<gasolineRule.length; i++){
-													if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
-														// 计算升数 和 优惠金额
-														that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= gasolineRule[i - 1].gasolineRule1 && that.deductAmount < gasolineRule[i].gasolineRule1) {
-														that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
-													that.gradeRedece = (that.deductAmount/that.oilPrice * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2)
-													that.isGradePreferential = true
-												}
-											}
-										}
-									}
-									if (that.oilType == "柴油"){
-										// 将数组按照金额从小到大排序
-										let dieselRule = JSON.parse(res.data.userGrade.dieselRule).sort((a,b) => a.dieselRule1 - b.dieselRule1);
-										if (res.data.userGrade.dieselDiscount == "满减优惠"){
-											if (dieselRule.length > 1){
-												for (let i = 1; i<dieselRule.length; i++){
-													if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
-														that.gradeRedece = dieselRule[dieselRule.length-1].dieselRule2
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= dieselRule[i - 1].dieselRule1 && that.deductAmount < dieselRule[i].dieselRule1) {
-														that.gradeRedece = dieselRule[i - 1].dieselRule2
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
-													that.gradeRedece = dieselRule[dieselRule.length-1].dieselRule2
-													that.isGradePreferential = true
-												}
-											}
-										}
-										if (res.data.userGrade.dieselDiscount == "每升优惠"){
-											if (dieselRule.length > 1){
-												for (let i = 1; i<dieselRule.length; i++){
-													if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
-														// 计算升数 和 优惠金额
-														that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= dieselRule[i - 1].dieselRule1 && that.deductAmount < dieselRule[i].dieselRule1) {
-														that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[i - 1].dieselRule3).toFixed(2)
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= dieselRule[dieselRule.length-1].dieselRule1){
-													that.gradeRedece = (that.deductAmount/that.oilPrice * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2)
-													that.isGradePreferential = true
-												}
-											}
-										}
-									}
-									if (that.oilType == "天然气"){
-										// 将数组按照金额从小到大排序
-										let naturalGasRule = JSON.parse(res.data.userGrade.naturalGasRule).sort((a,b) => a.naturalGasRule1 - b.naturalGasRule1);
-										if (res.data.userGrade.naturalGasDiscount == "满减优惠"){
-											if (naturalGasRule.length > 1){
-												for (let i = 1; i<naturalGasRule.length; i++){
-													if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
-														that.gradeRedece = naturalGasRule[naturalGasRule.length-1].naturalGasRule2
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.deductAmount < naturalGasRule[i].naturalGasRule1) {
-														that.gradeRedece = naturalGasRule[i - 1].naturalGasRule2
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
-													that.gradeRedece = naturalGasRule[naturalGasRule.length-1].naturalGasRule2
-													that.isGradePreferential = true
-												}
-											}
-										}
-										if (res.data.userGrade.naturalGasDiscount == "每升优惠"){
-											if (naturalGasRule.length > 1){
-												for (let i = 1; i<naturalGasRule.length; i++){
-													if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
-														// 计算升数 和 优惠金额
-														that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
-														that.isGradePreferential = true
-														break;
-													}
-													if (that.deductAmount >= naturalGasRule[i - 1].naturalGasRule1 && that.deductAmount < naturalGasRule[i].naturalGasRule1) {
-														that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-														that.isGradePreferential = true
-													}
-												}
-											}else{
-												if (that.deductAmount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
-													that.gradeRedece = (that.deductAmount/that.oilPrice * naturalGasRule[naturalGasRule.length-1].naturalGasRule3).toFixed(2)
-													that.isGradePreferential = true
-												}
-											}
-										}
-									}
-								}
-							}
-							
+							that.isFixingLevel = true
+							// if (res.data.fixingLevel.storeValue=="no" && that.balanceRedece>0){
+							// 	that.gradeRedece = 0
+							// }
 						}
-						
-						that.countPayMent()
+					
 					}
 				})
 			},
@@ -840,7 +707,7 @@
 			},
 			
 			// 根据店铺id查询用户信息
-			getUser(id){
+			async getUser(id){
 				let _this = this;
 				request({
 					url: "business/userManager/user/storeUser",
@@ -854,14 +721,18 @@
 					}
 					_this.user = res.data.userVo;
 					_this.user = res.data.userVo;
+					_this.chooseGrade(_this.user.id,_this.user.gradeId);
 					if (res.data.userVo.refuelMoney && res.data.userVo.refuelMoney!='null'){
 						_this.refuelMoney = JSON.parse(res.data.userVo.refuelMoney)
 						_this.refuelMoneyAfter = JSON.parse(res.data.userVo.refuelMoney)
 						_this.chooseRefuelMoney()
 					}else{
 						_this.chooseCardBalance(0)
-						_this.getPaymentPreferential(this.user.gradeId)
+						if (!this.isFixingLevel){
+							_this.getPaymentPreferential(this.user.gradeId)
+						}
 					}
+					console.log("afterGrade");
 					// _this.chooseGrade(res.data.userVo.id,res.data.userVo.gradeId)
 				})
 			},
@@ -961,7 +832,7 @@
 				}).then((res) => {
 					res.data.forEach(item => {
 						if (item.oilName == _this.oilOrder.oils) {
-							_this.oilPrice = item.gbPrice;
+							_this.oilPrice = item.oilPrice;
 							_this.oilName = item.oilNames;
 							_this.oilNameId = item.oilName;
 							_this.oilType = item.oilType;