From 57206c4ad637d93de85b0465276c58110e574acb Mon Sep 17 00:00:00 2001
From: sw <17615834396@163.com>
Date: Tue, 5 Nov 2024 15:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E7=AB=99=E8=B4=A2=E5=8A=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../printer/mapper/xml/PrintDeviceInfoMapper.xml   |  2 +-
 .../printer/template/PrintOilOrderReport.java      | 14 +++++++-------
 .../cashier/orderComponents/order_Cashier.vue      | 11 ++++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
index 87de25153..7e07aa89c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
@@ -142,7 +142,7 @@
     <select id="getInfoByStoreId" resultType="com.fuint.business.printer.entity.PrintDeviceInfo">
         select
             id,machine_code,msign,device_name,user_id,app_key,app_secret,app_public_key,platform_public_key,access_token,payment,create_time,update_time,create_by,update_by,store_id ,acquiesce       from print_device_info
-        where store_id = #{storeId} and acquiesce = true limit 1
+        where store_id = #{storeId} and acquiesce = 0 order by create_time ASC limit 1
     </select>
 
     <!--新增所有列-->
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 96dcf0c11..7bab58274 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
@@ -154,9 +154,9 @@ public class PrintOilOrderReport {
 
             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) {
-                sb.append("<tr><td>"+stringStringMap.get("oilName")+"</td>");
-                sb.append("<td>￥"+ stringStringMap.get("amount")+"</td></tr>");
+            for (Map<String, String> stringStringMap1 : o) {
+                sb.append("<tr><td>"+stringStringMap1.get("oilName")+"</td>");
+                sb.append("<td>￥"+ stringStringMap1.get("amount")+"</td></tr>");
             }
             sb.append("</table>");
             sb.append("--------------------------------\r\n");
@@ -165,11 +165,11 @@ public class PrintOilOrderReport {
         if (ObjectUtil.isNotEmpty(handover.get("goodsOrder"))) {
             sb.append("<table><tr><td>商品</td><td>数量</td><td>单价</td></tr>");
             List<Map<String,String>> o = (List<Map<String,String>>)handover.get("goodsOrder");
-            for (Map<String, String> stringStringMap : o) {
-                sb.append("<tr><td>"+stringStringMap.get("oilName")+"</td>");
-                sb.append("<td>"+stringStringMap.get("unit")+"</td>");
+            for (Map<String, String> stringStringMap2 : o) {
+                sb.append("<tr><td>"+stringStringMap2.get("oilName")+"</td>");
+                sb.append("<td>"+stringStringMap2.get("unit")+"</td>");
 
-                sb.append("<td>"+ stringStringMap.get("amount")+"</td></tr>");
+                sb.append("<td>"+ stringStringMap2.get("amount")+"</td></tr>");
             }
             sb.append("</table>");
             sb.append("--------------------------------\r\n");
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 580f1e1e5..7b6ad13b4 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -186,7 +186,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 style="color: #fe8c4a" size="mini" class="makeupticket"
                      @click="getOrdersInfo(scope.row.id)"
                      type="text" plain round
                 >详情
@@ -195,13 +195,13 @@
                 <!--                           @click="getOrdersInfo2(scope.row.id)"-->
                 <!--                           type="text" plain round>详情2-->
                 <!--                </el-button>-->
-                <div style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini" class="makeupticket"
                      v-if="scope.row.status === 'paid'"
                      @click="patchwork(scope.row)"
                      type="text" plain round
                 >补打小票
                 </div>
-                <div style="color: #fe8c4a" size="mini"
+                <div style="color: #fe8c4a" size="mini" class="makeupticket"
                      v-if="scope.row.status === 'paid'"
                      @click="refHandleRefund(scope.row.id)"
                      type="text" plain round
@@ -1024,13 +1024,14 @@ export default {
         if (order.oilCardAmount) {
           oilCardAmount += order.oilCardAmount
         }
+        console.log(22222222222)
         let o = {
           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(),
-          payUser:order.payUser.toString(),
-          orderNo:order.orderNo.toString()
+          payUser:order.payUser,
+          orderNo:order.orderNo
         }
         oilOrderR.push(o)
       })