From 2a3f80675e4ba51e01db6aac60e66e9c585a3bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Sat, 26 Oct 2024 14:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=B0=8F=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../printer/controller/printerController.java | 57 +++++++++++++++----
 .../printer/service/PrinterService.java       |  6 +-
 .../service/impl/PrinterServiceImpl.java      | 21 ++++---
 .../template/PrintCardValueReport.java        | 15 +++--
 .../printer/template/PrintOilOrderReport.java | 19 ++++---
 .../template/RePrintOilOrderReport.java       | 15 +++--
 .../views/cashier/NewComponents/newHome.vue   | 13 ++++-
 .../views/cashier/NewComponents/writeList.vue |  3 +-
 .../cashier/orderComponents/order_Cashier.vue | 23 +++++---
 .../cashier/orderComponents/order_Goods.vue   | 15 +++--
 .../cashier/orderComponents/order_Oil.vue     |  9 ++-
 .../cashier/orderComponents/order_Vip.vue     | 13 ++++-
 12 files changed, 140 insertions(+), 69 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
index 742cf07e4..ebd03e4c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/controller/printerController.java
@@ -275,22 +275,44 @@ public class printerController extends BaseController {
 //        Integer random6 = (int) ((Math.random() * 9 + 1) * 100000);
 //        String url=m.print("4004872261", PrintOilOrderReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString());
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        MtUser mtUser=null;
+        UserBalance userBalance=null;
+        LJUserGrade ljUserGrade=null;
+        String orderNo=null;
+        List<Map<String,String>> o = (List<Map<String,String>>)oilOrder.get("oilOrder");
+            for (Map<String, String> stringStringMap : o) {
+                orderNo=stringStringMap.get("orderNo");
+                if("散客".equals(stringStringMap.get("payUser"))){
+                }else {
+                    mtUser=mtUserMapper.selectByPhone(stringStringMap.get("payUser"));
+                    userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
+                    ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
+                }
+            }
         ReceiptPrinting receiptPrinting = receiptPrintingService.queryReceiptPrintingOne(nowAccountInfo.getStoreId());
-        MtUser mtUser=mtUserMapper.selectByPhone("13964068390");
-        UserBalance userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
-        LJUserGrade ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
-        printerService.oilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade);
+        printerService.oilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
 
     }
 
     @PostMapping("rePrintOilOrderReport")
     public void reOilOrderReport(@RequestBody Map<String, Object> oilOrder) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        MtUser mtUser=null;
+        UserBalance userBalance=null;
+        LJUserGrade ljUserGrade=null;
+        String orderNo=null;
+        List<Map<String,String>> o = (List<Map<String,String>>)oilOrder.get("oilOrder");
+        for (Map<String, String> stringStringMap : o) {
+            orderNo=stringStringMap.get("orderNo");
+            if("散客".equals(stringStringMap.get("payUser"))){
+            }else {
+                mtUser=mtUserMapper.selectByPhone(stringStringMap.get("payUser"));
+                userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
+                ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
+            }
+        }
         ReceiptPrinting receiptPrinting = receiptPrintingService.queryReceiptPrintingOne(nowAccountInfo.getStoreId());
-        MtUser mtUser=mtUserMapper.selectByPhone("13964068390");
-        UserBalance userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
-        LJUserGrade ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
-        printerService.reOilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade);
+        printerService.reOilOrderReport(oilOrder,TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
     }
     /**
      * 余额充值订单
@@ -307,11 +329,22 @@ public class printerController extends BaseController {
 //        Integer random6 = (int) ((Math.random() * 9 + 1) * 100000);
 //        String url=m.print("4004872261", PrintCardValueReport.printOilOrder(), "Z"+System.currentTimeMillis()+random6.toString());
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        MtUser mtUser=null;
+        UserBalance userBalance=null;
+        LJUserGrade ljUserGrade=null;
+        String orderNo=null;
+        List<Map<String,String>> o = (List<Map<String,String>>)cardValue.get("oilOrder");
+        for (Map<String, String> stringStringMap : o) {
+            orderNo=stringStringMap.get("orderNo");
+            if("散客".equals(stringStringMap.get("payUser"))){
+            }else {
+                mtUser=mtUserMapper.selectByPhone(stringStringMap.get("payUser"));
+                userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
+                ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
+            }
+        }
         ReceiptPrinting receiptPrinting = receiptPrintingService.queryReceiptPrintingOne(nowAccountInfo.getStoreId());
-        MtUser mtUser=mtUserMapper.selectByPhone("13964068390");
-        UserBalance userBalance=userBalanceMapper.getUserBalanceByUserId(mtUser.getId().toString());
-        LJUserGrade ljUserGrade= ljUserGradeMapper.getUserGradeByUserId(userBalance.getGradeId().toString());
-        printerService.printCardValueReport(cardValue, TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade);
+        printerService.printCardValueReport(cardValue, TokenUtil.getNowAccountInfo().getStoreId(),receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
 
     }
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java
index 297921c64..79209d9e3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/PrinterService.java
@@ -26,12 +26,12 @@ public interface PrinterService {
     String printIndex(BigDecimal payAmount,Integer storeId);
 
     void getHandover(Map<String, Object> handover,Integer storeId);
-    void oilOrderReport(Map<String, Object> handover, Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade);
-    void reOilOrderReport(Map<String, Object> oilOrder, Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade);
+    void oilOrderReport(Map<String, Object> handover, Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade,String orderNo);
+    void reOilOrderReport(Map<String, Object> oilOrder, Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade,String orderNo);
     void printTagReport(Map<String, Object> integral,Integer storeId);
 
 
-    void printCardValueReport(Map<String, Object> printCardValue,Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade);
+    void printCardValueReport(Map<String, Object> printCardValue,Integer storeId, ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade,String orderNo);
     void printFuelDieselReport(Map<String, Object> printCardValue,Integer storeId);
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
index d1571a60c..6a8193677 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/service/impl/PrinterServiceImpl.java
@@ -235,9 +235,10 @@ public class PrinterServiceImpl implements PrinterService {
         }
     }
 
-    public void oilOrderReport(Map<String, Object> oilOrder, Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade) {
+    public void oilOrderReport(Map<String, Object> oilOrder, Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade
+            ,String orderNo) {
         PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId);
-        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo("234520241023114642fc06e4");
+        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo(orderNo);
         Methods m=Methods.getInstance();
         Object accessToken = RedisUtil.get("scancodemodel+" + storeId);
         if (ObjectUtil.isNotEmpty(accessToken)) {
@@ -260,14 +261,15 @@ public class PrinterServiceImpl implements PrinterService {
             String error = jsonObject.getString("error");
             if ("18".equals(error)) {
                 getToken(storeId);
-                oilOrderReport(oilOrder,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade);
+                oilOrderReport(oilOrder,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
             }
 
         }
     }
-    public void reOilOrderReport(Map<String, Object> oilOrder,Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade) {
+    public void reOilOrderReport(Map<String, Object> oilOrder,Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade
+            ,String orderNo) {
         PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId);
-        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo("234520241023114642fc06e4");
+        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo(orderNo);
         Methods m=Methods.getInstance();
         Object accessToken = RedisUtil.get("scancodemodel+" + storeId);
         if (ObjectUtil.isNotEmpty(accessToken)) {
@@ -291,16 +293,17 @@ public class PrinterServiceImpl implements PrinterService {
             String error = jsonObject.getString("error");
             if ("18".equals(error)) {
                 getToken(storeId);
-                reOilOrderReport(oilOrder,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade);
+                reOilOrderReport(oilOrder,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
             }
 
         }
 
     }
 
-    public void printCardValueReport(Map<String, Object> cardValue,Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade) {
+    public void printCardValueReport(Map<String, Object> cardValue,Integer storeId,ReceiptPrinting receiptPrinting, MtUser mtUser, UserBalance userBalance, LJUserGrade ljUserGrade
+    ,String orderNo) {
         PrintDeviceInfo infoByStoreId = printDeviceInfoMapper.getInfoByStoreId(storeId);
-        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo("234520241023114642fc06e4");
+        AllOrderInfoVo allOrderInfoVo=allOrderInfoMapper.getOneByOrderNo(orderNo);
         log.info("handover:{}",cardValue.toString());
         Methods m=Methods.getInstance();
         Object accessToken = RedisUtil.get("scancodemodel+" + storeId);
@@ -325,7 +328,7 @@ public class PrinterServiceImpl implements PrinterService {
             String error = jsonObject.getString("error");
             if ("18".equals(error)) {
                 getToken(storeId);
-                printCardValueReport(cardValue,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade);
+                printCardValueReport(cardValue,storeId,receiptPrinting,mtUser,userBalance,ljUserGrade,orderNo);
             }
 
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java
index a9fdcce64..285b2198d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintCardValueReport.java
@@ -83,39 +83,38 @@ public class PrintCardValueReport {
 
         System.out.println( receiptPrinting.getPrintTemplateTop());
         receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("xxxxx","32131566313655"));
-        if(mtUser.getUserNo()!=null){
+        if(mtUser!=null&&mtUser.getUserNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("kkkkk",mtUser.getUserNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("卡号:kkkkk\r\n",""));
         }
-        if(mtUser.getCarNo()!=null){
+        if(mtUser!=null&&mtUser.getCarNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ccccc",mtUser.getCarNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("车牌号:ccccc\r\n",""));
         }
-        if(ljUserGrade.getName()!=null){
+        if(ljUserGrade!=null&&ljUserGrade.getName()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ddddd",ljUserGrade.getName()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("等级:ddddd\r\n",""));
         }
-        if(mtUser.getMobile()!=null){
+        if(mtUser!=null&&mtUser.getMobile()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("sssss",mtUser.getMobile()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("手机号:sssss\r\n",""));
         }
-        if(userBalance.getCardBalance().toString()!=null){
+        if(userBalance!=null&&userBalance.getCardBalance().toString()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("yyyyy",userBalance.getCardBalance().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("余额:yyyyy\r\n",""));
         }
-        if(userBalance.getPoints().toString()!=null){
+        if(userBalance!=null&&userBalance.getPoints().toString()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("jjjjj",userBalance.getPoints().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("积分:jjjjj\r\n",""));
         }
 
-        if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) {
-
+        if (allOrderInfoVo.getType().equals("1")) {
             sb.append("<table><tr><td>油品</td><td>金额</td></tr>");
             List<Map<String,String>> o = (List<Map<String,String>>)handover.get("oilOrder");
             for (Map<String, String> stringStringMap : o) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
index 7e0e505b0..96dcf0c11 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintOilOrderReport.java
@@ -95,6 +95,11 @@ public class PrintOilOrderReport {
 //        sb.append("<center>谢谢惠顾，欢迎下次光临！</center>");
 //
 //        return sb.toString();
+        String orderNo=null;
+        List<Map<String,String>> o1 = (List<Map<String,String>>)handover.get("oilOrder");
+        for (Map<String, String> stringStringMap : o1) {
+            orderNo=stringStringMap.get("orderNo");
+        }
         StringBuilder sb=new StringBuilder();
 
         LocalDateTime now = LocalDateTime.now();
@@ -114,33 +119,33 @@ public class PrintOilOrderReport {
         }
 
         System.out.println( receiptPrinting.getPrintTemplateTop());
-        receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("xxxxx","32131566313655"));
-        if(mtUser.getUserNo()!=null){
+        receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("xxxxx",orderNo));
+        if(mtUser!=null&&mtUser.getUserNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("kkkkk",mtUser.getUserNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("卡号:kkkkk\r\n",""));
         }
-        if(mtUser.getCarNo()!=null){
+        if(mtUser!=null&&mtUser.getCarNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ccccc",mtUser.getCarNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("车牌号:ccccc\r\n",""));
         }
-        if(ljUserGrade.getName()!=null){
+        if(ljUserGrade!=null &&ljUserGrade.getName()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ddddd",ljUserGrade.getName()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("等级:ddddd\r\n",""));
         }
-        if(mtUser.getMobile()!=null){
+        if(mtUser!=null&&mtUser.getMobile()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("sssss",mtUser.getMobile()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("手机号:sssss\r\n",""));
         }
-        if(userBalance.getCardBalance().toString()!=null){
+        if(userBalance!=null&&userBalance.getCardBalance()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("yyyyy",userBalance.getCardBalance().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("余额:yyyyy\r\n",""));
         }
-        if(userBalance.getPoints().toString()!=null){
+        if(userBalance!=null&&userBalance.getPoints().toString()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("jjjjj",userBalance.getPoints().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("积分:jjjjj\r\n",""));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java
index cbe6c7703..4c9fc7bf0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/RePrintOilOrderReport.java
@@ -124,39 +124,38 @@ public class RePrintOilOrderReport {
 
         System.out.println( receiptPrinting.getPrintTemplateTop());
         receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("xxxxx","32131566313655"));
-        if(mtUser.getUserNo()!=null){
+        if(mtUser!=null&&mtUser.getUserNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("kkkkk",mtUser.getUserNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("卡号:kkkkk\r\n",""));
         }
-        if(mtUser.getCarNo()!=null){
+        if( mtUser!=null && mtUser.getCarNo()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ccccc",mtUser.getCarNo()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("车牌号:ccccc\r\n",""));
         }
-        if(ljUserGrade.getName()!=null){
+        if(ljUserGrade!=null&&ljUserGrade.getName()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("ddddd",ljUserGrade.getName()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("等级:ddddd\r\n",""));
         }
-        if(mtUser.getMobile()!=null){
+        if(mtUser!=null && mtUser.getMobile()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("sssss",mtUser.getMobile()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("手机号:sssss\r\n",""));
         }
-        if(userBalance.getCardBalance().toString()!=null){
+        if(userBalance!=null && userBalance.getCardBalance().toString()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("yyyyy",userBalance.getCardBalance().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("余额:yyyyy\r\n",""));
         }
-        if(userBalance.getPoints().toString()!=null){
+        if(userBalance!=null && userBalance.getPoints().toString()!=null){
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("jjjjj",userBalance.getPoints().toString()));
         }else {
             receiptPrinting.setPrintTemplateTop(receiptPrinting.getPrintTemplateTop().replace("积分:jjjjj\r\n",""));
         }
 
-        if (ObjectUtil.isNotEmpty(handover.get("oilOrder"))) {
-
+        if (allOrderInfoVo.getType().equals("1")) {
             sb.append("<table><tr><td>油品</td><td>金额</td></tr>");
             List<Map<String,String>> o = (List<Map<String,String>>)handover.get("oilOrder");
             for (Map<String, String> stringStringMap : o) {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 9a8138478..9600b6665 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -720,7 +720,11 @@ export default {
       flag: 1,
       jishuqi: 0,
       continuePolling: true, // 控制轮询的变量
-      sendCouponList: []
+      sendCouponList: [],
+      oilOrder: {
+        orderNo: null,
+        payUser: null
+      },
     }
   },
   watch: {
@@ -1074,6 +1078,8 @@ export default {
         await getCheckTheStatusOfYourPaymentApi(id).then(async response => {
           if (response.data != null) {
             const payStatus = response.data.payStatus
+            this.oilOrder.orderNo=response.data.paymentNo
+            this.oilOrder.payUser=response.data.mobile
             if (payStatus === "unpaid") {
               this_.isQuery = true;
             } else if (payStatus === "paid") {
@@ -1207,7 +1213,6 @@ export default {
       let payTypeText = payTypeMap[this.payType] || '小程序码';
 
       let f = {
-        oilOrder: oilOrderR,
         goodsOrder: goodsOrderR,
         payType: payTypeText,
         unitName: "", // 挂账单位
@@ -1248,8 +1253,10 @@ export default {
         console.log(1226)
         let payTypeText = payTypeMap[this.payForm.paymentType]
         let actualPay = this.payForm.paymentType == 'CASH' ? this.payForm.authCode:this.payForm.realyPayBills
-
+        let oilOrderR = []
+        oilOrderR.push(this.oilOrder)
         let a = {
+          oilOrder: oilOrderR,
           // 充值金额
           realyPayBills:this.payForm.realyPayBills,
           //赠送金额
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
index 5270aecd4..f19baad62 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
@@ -61,7 +61,8 @@
         <el-table-column label="核销时间" align="center" prop="terminal"/>
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
+            <el-button style="color: #fe8c4a"
+                       @click="patchwork(scope.row)"
                        type="text" >补打
             </el-button>
             <el-button style="color: #fe8c4a"
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 181a6447c..af9cb3724 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -181,7 +181,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center"  class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <div style="color: #fe8c4a" size="mini"
+                <div class="makeupticket" style="color: #fe8c4a" size="mini"
                            @click="getOrdersInfo(scope.row.id)"
                            type="text" plain round>详情
                 </div>
@@ -189,11 +189,13 @@
 <!--                           @click="getOrdersInfo2(scope.row.id)"-->
 <!--                           type="text" plain round>详情2-->
 <!--                </el-button>-->
-                <div style="color: #fe8c4a" size="mini"
-                           @click="patchwork(scope.row)"
-                           type="text" plain round>补打小票
-                </div>
-                <div style="color: #fe8c4a" size="mini"
+                  <div class="makeupticket" style="color: #fe8c4a" size="mini"
+                       v-if="scope.row.status === 'paid'"
+                             @click="patchwork(scope.row)"
+                             type="text" plain round>补打小票
+                  </div>
+
+                <div  class="makeupticket" style="color: #fe8c4a" size="mini"
                            v-if="scope.row.status === 'paid'"
                            @click="refHandleRefund(scope.row.id)"
                            type="text" plain round>退款
@@ -994,7 +996,9 @@ export default {
           oilName: this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
           amount: order.orderAmount.toString(),
           // amount : order.oilPayAmount.toString(),
-          oilNum: order.oilNum.toString()
+          oilNum: order.oilNum.toString(),
+          payUser:order.payUser.toString(),
+          orderNo:order.orderNo.toString()
         }
         oilOrderR.push(o)
       })
@@ -1002,7 +1006,6 @@ export default {
       let goodsOrderR = []
       if (this.goodsInfo) {
         this.goodsInfo.forEach(order => {
-
           let o = {
             oilName: order.name,
             unit: order.num + "" + order.unit,
@@ -1013,7 +1016,6 @@ export default {
         })
       }
 
-      console.log("111111111111111111111111112")
 
       // 支付方式
       const payTypeMap = {
@@ -1589,4 +1591,7 @@ export default {
   padding: 15px
 
 }
+.makeupticket{
+  cursor:pointer;
+}
 </style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index 89080d593..de4ca6748 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -186,7 +186,9 @@
             </el-table-column>
             <el-table-column label="操作" align="center"  class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button style="color: #fe8c4a" @click="patchwork(scope.row)"
+                <el-button style="color: #fe8c4a"
+                           v-if="scope.row.status === 'paid'"
+                           @click="patchwork(scope.row)"
                            type="text" >补打
                 </el-button>
                 <el-button style="color: #fe8c4a"
@@ -525,7 +527,11 @@ export default {
     // 打印商品支付后的订单
     oilOrderReport() {
       let oilOrderR = []
-
+      let o1 = {
+        payUser:this.goods.payUser,
+        orderNo:this.goods.orderNo
+      }
+      oilOrderR.push(o1)
       let goodsOrderR = []
       if (this.goodsList) {
         this.goodsList.forEach(order => {
@@ -533,13 +539,12 @@ export default {
             oilName: order.name,
             unit: order.num + "" + order.unit,
             // amount : order.memberPrice.toString()
-            amount: order.retailPrice.toString()
+            amount: order.retailPrice.toString(),
           }
           goodsOrderR.push(o)
         })
       }
-
-
+      console.log("333333333333333333333333")
       // 支付方式
       const payTypeMap = {
         'CASH': '现金',
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index a4a7e04da..cd3464f8b 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -241,7 +241,10 @@
 
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
               <template slot-scope="scope">
-                <el-button style="color: #fe8c4a" @click="patchwork(scope.row)" type="text">补打
+                <el-button style="color: #fe8c4a"
+                           @click="patchwork(scope.row)"
+                           v-if="scope.row.orderStatus === 'paid'"
+                           type="text">补打
                 </el-button>
 <!--       @click="handleRefund(scope.row.id)"         -->
 
@@ -572,7 +575,9 @@ export default {
       let oilOrderR = []
       let o = {
         oilName: this.getName(this.oilNameList, this.oilOrder.oils) + "-" + this.getName1(this.oilGunList, this.oilOrder.oilGunNum),
-        amount: this.oilOrder.orderAmount.toString()
+        amount: this.oilOrder.orderAmount.toString(),
+        payUser:this.oilOrder.payUser.toString(),
+        orderNo:this.oilOrder.orderNo.toString()
       }
       oilOrderR.push(o)
 
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index 8f740bd15..ed02efde0 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -173,7 +173,7 @@
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <!--              <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
-                <div style="width: 60px;color: #ff8c4b;margin: 0 auto"
+                <div class="makeupticket" style="width: 60px;color: #ff8c4b;margin: 0 auto"
                            @click="patchwork(scope.row)"
                            type="primary" plain round>补打
                 </div>
@@ -470,8 +470,14 @@ export default {
       };
       let payTypeText = payTypeMap[this.oilOrder.paymentType]
       // let actualPay = this.cardValueForm.paymentType == 'CASH' ? this.authCode:this.realyPayBills
-
+      let oilOrderR = []
+      let o = {
+        payUser:this.oilOrder.mobile,
+        orderNo:this.oilOrder.paymentNo
+      }
+      oilOrderR.push(o)
       let a = {
+        oilOrder:oilOrderR,
         // 充值金额
         realyPayBills: this.oilOrder.amount ? this.oilOrder.amount : this.oilOrder.rechargeBalance,
         //赠送金额
@@ -720,4 +726,7 @@ export default {
 .el-form--inline .el-form-item {
 margin-right: 20px;
 }
+.makeupticket{
+  cursor:pointer;
+}
 </style>