From 2e7f18845afc70874732e43b873c9ece73b5b120 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 6 Jun 2024 17:16:22 +0800
Subject: [PATCH 1/2] no message

---
 fuintAdmin/src/api/handover/handover.js       |  8 +++++-
 .../src/views/handover/HandoverOnly.vue       | 14 ++++++++--
 .../cardValue/dto/CardValueRecordDTO.java     |  1 -
 .../cardValue/entity/CardValueRecord.java     |  3 +++
 .../impl/CardValueRecordServiceImpl.java      |  8 +++++-
 .../service/impl/PrinterServiceImpl.java      | 10 +++++++
 .../business/printer/template/Handover.java   |  6 +++++
 .../views/cashier/NewComponents/Handover.vue  |  9 +++++++
 .../cashier/NewComponents/HandoverOnly.vue    |  7 +++++
 .../views/cashier/NewComponents/homeindex.vue | 27 ++++++++++++++-----
 .../cashier/orderComponents/order_Cashier.vue |  4 +--
 .../cashier/orderComponents/order_Goods.vue   |  3 ++-
 fuintCashierWeb/src/views/details/index.vue   | 10 +++++--
 pos-uni/pages/index/index.vue                 | 14 +++++++---
 .../MemberRecharge/MemberRecharge.vue         |  2 ++
 pos-uni/pagesHome/orderList/orderList.vue     | 14 +++++++---
 16 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/fuintAdmin/src/api/handover/handover.js b/fuintAdmin/src/api/handover/handover.js
index 85ebb04e2..66ab8c038 100644
--- a/fuintAdmin/src/api/handover/handover.js
+++ b/fuintAdmin/src/api/handover/handover.js
@@ -23,7 +23,13 @@ export function addHandoverApi(data) {
     data: data
   })
 }
-
+export function printGetHandoverReport(data) {
+  return request({
+    url: 'business/printer/getHandover',
+    method: 'post',
+    data: data
+  })
+}
 export function printLocallyApi(data) {
   return request({
     url: '/business/handoverRecord/printLocally',
diff --git a/fuintAdmin/src/views/handover/HandoverOnly.vue b/fuintAdmin/src/views/handover/HandoverOnly.vue
index 79bfb911d..070792f9f 100644
--- a/fuintAdmin/src/views/handover/HandoverOnly.vue
+++ b/fuintAdmin/src/views/handover/HandoverOnly.vue
@@ -371,7 +371,7 @@
 </template>
 
 <script>
-// import {printLocallyApi,addHandoverApis} from "@/api/handover/handover";
+import {printLocallyApi, addHandoverApis, printGetHandoverReport} from "@/api/handover/handover";
 import BigNumber from "bignumber.js";
 import {getLodop} from "@/api/LodopFuncs";
 
@@ -392,8 +392,12 @@ import {getLodop} from "@/api/LodopFuncs";
         // this.getHandover();
       },
       methods: {
-
         printLocally() {
+          printGetHandoverReport(this.handoverList).then(res=>{
+
+          })
+        },
+        printLocally1() {
           // const printHTML = document.querySelector('#report').innerHTML
           // // 将打印的区域赋值，进行打印
           // window.document.body.innerHTML = printHTML
@@ -541,6 +545,12 @@ import {getLodop} from "@/api/LodopFuncs";
             case 'CASH':
               return '现金'
               break;
+            case 'balance':
+              return '余额'
+              break;
+            case 'oilCard':
+              return '油卡'
+              break;
           }
           return '未知'
         },
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
index a1b0a0634..8a7f1d902 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
@@ -27,7 +27,6 @@ public class CardValueRecordDTO extends CardValueRecord {
     private String appltType;
     private String paymentType;
     private String payStatus;
-    private String payChannel;
     private String types;
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date expireTime;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
index 4428ae14f..f9a0b768f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
@@ -28,6 +28,9 @@ public class CardValueRecord extends Model<CardValueRecord> {
     private Integer mtUserId;
     //会员名字
     private String name;
+
+    private String payChannel;
+
     //会员手机号码
     private String mobile;
     //员工id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index c253559a6..e1750be12 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -468,7 +468,13 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         allOrderInfo.setPayMoney(cardValueRecordDTO.getRealyPayBills());
         allOrderInfo.setPayType("CASH");
         allOrderInfo.setUserId(cardValueRecordDTO.getMtUserId());
-        allOrderInfo.setPayChannel("cashier");
+        if (ObjectUtil.isNotEmpty(cardValueRecordDTO.getPayChannel())) {
+            allOrderInfo.setPayChannel(cardValueRecordDTO.getPayChannel());
+
+        }else {
+            allOrderInfo.setPayChannel("cashier");
+
+        }
         allOrderInfo.setStatus("paid");
         allOrderInfo.setContent("储值卡充值");
         allOrderInfo.setPayTime(new Date());
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 742143655..8c659c010 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
@@ -214,7 +214,17 @@ public class PrinterServiceImpl implements PrinterService {
         Handover.setHandover(handover);
         Integer random6 = (int) ((Math.random() * 9 + 1) * 100000);
         String url=m.print(infoByStoreId.getMachineCode(), Handover.printHandover(), "Z"+System.currentTimeMillis()+random6.toString());
+        if (ObjectUtil.isNotEmpty(url)) {
+            // 使用 Fastjson 将 JSON 字符串解析为 JSONObject
+            JSONObject jsonObject = JSON.parseObject(url);
 
+            String error = jsonObject.getString("error");
+            if ("18".equals(error)) {
+                getToken(storeId);
+                getHandover(handover,storeId);
+            }
+
+        }
     }
 
     public void oilOrderReport(Map<String, Object> oilOrder,Integer storeId) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java
index e44e2b505..e2c270863 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/Handover.java
@@ -405,6 +405,12 @@ public class Handover {
                 return "银联二维码";
             case "CASH":
                 return "现金";
+            case "balance":
+                return "余额";
+            case "APPLET_CODE":
+                return "会员码";
+            case "oilCard":
+                return "油卡";
             default:
                 return "其他";
         }
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
index 6fc1c6d2c..322634bad 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
@@ -503,6 +503,15 @@ import {printGetHandoverReport, rePrintOilOrderReport} from "@/api/print";
             case 'CASH':
               return '现金'
               break;
+            case 'balance':
+              return '余额'
+              break;
+            case 'APPLET_CODE':
+              return '会员码'
+              break;
+            case 'oilCard':
+              return '油卡'
+              break;
           }
           return '未知'
         },
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
index cc9a84a25..19939cd48 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/HandoverOnly.vue
@@ -174,6 +174,7 @@
           <div>支付方式</div>
           <div>金额</div>
         </div>
+<!--        {{paymentAggregation('oil')   }}-->
         <div class="input-box" v-for="item in paymentAggregation('oil')">
           <div>{{calculateThePaymentMethod(item.payType)}}</div>
           <div>￥{{item.paidAmount}}</div>
@@ -546,6 +547,12 @@ import {printGetHandoverReport} from "@/api/print";
             case 'CASH':
               return '现金'
               break;
+            case 'balance':
+              return '余额'
+              break;
+            case 'oilCard':
+              return '油卡'
+              break;
           }
           return '未知'
         },
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index e861358bd..a761eabfd 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -1627,6 +1627,8 @@
           creditLimit: [ { required: true, message: "请填写挂账额度", trigger: "blur" }, ],
           status: [ { required: true, message: "请选择挂账单位状态", trigger: "blur" }, ],
         },
+        continuePolling: true, // 控制轮询的变量
+
         // 表单校验
         rules2: {
           number: [{required: true, message: "请输入卡号", trigger: "blur"}],
@@ -2034,6 +2036,7 @@
       },
       cancelCollection() {
         this.openConfirm = false;
+        this.continuePolling = false;
       },
       // 选择余额充值金额
       rechargeCard(index, item) {
@@ -2126,7 +2129,7 @@
         this.activeRecharge = 'balance'
         this.cardValueForm = {}
         this.cardFuelDieselForm = {}
-
+        this.continuePolling = false
         this.iniz()
       },
       iniz() {
@@ -2206,7 +2209,7 @@
         this.openConfirm = true;
         this.isPay = true
 
-        this.getCode(this.realyPayBills)
+        this.getCode(this.realyPayBills,1)
 
       },
        printLocally() {
@@ -2482,6 +2485,7 @@
       clear(){
         // this.autofocus = false
         this.dialogVisiblej = false
+        this.continuePolling = false
         this.seekZero = 0
         let mobile = this.member.mobile
         getUserInfoMobile({mobile:mobile}).then( response => {
@@ -3629,18 +3633,24 @@
         }
 
         this.dialogVisiblej = true
-        this.getCode(((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2));
+        this.getCode(((+this.oilActualPay) + (+this.goodsActualPay)).toFixed(2),2);
         // this.getStaff()
       },
       // 网络下发之后获取条码
-      getCode(amount) {
+      getCode(amount,flag) {
+        console.log("this.payType",this.payType)        // 现金不参与
+        if (this.payType == "CASH" && flag == 1) {
+          return
+        }
+        if (this.cardValueForm.paymentType == "CASH" && flag == 1)
         this.jishuqi++;
         if (this.jishuqi == 30) {
           this.jishuqi = 0
           return
         }
+        this.continuePolling = true;
         getReturnCode ({payAmount:amount}).then(res=>{
-          if (res.data === "300") {
+          if (res.data === "300" && this.continuePolling) {
             setTimeout(() => {
               this.getCode(amount); // 重新发起请求
             }, 1000); // 停顿一秒
@@ -3669,13 +3679,14 @@
           }
           oilOrderR.push(o)
         })
-          console.log("11111111111111111111",this.goodsOrder)
         let goodsOrderR = []
         this.goodsOrder.forEach(order=>{
           let o = {
             oilName : order.name,
             unit : order.num+order.unit,
-            amount : order.memberPrice.toString()
+            // amount : order.memberPrice.toString()
+            amount : order.retailPrice.toString()
+
           }
           goodsOrderR.push(o)
         })
@@ -4243,6 +4254,7 @@
           // 会员消费金额（储值卡需要减少的金额）
           consumeAmount:0,
           typeIdex:'',
+
         };
         this.payType = "WECHAT"
       },
@@ -4356,6 +4368,7 @@
         this.dialogVisiblejLoading = false
         // this.resetting1()
         this.authCode = "";
+        this.continuePolling = false;
         this.userNo = ""
         this.map = {
           allAmount:0,
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index a927f7f99..5ee8cb73b 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -761,7 +761,6 @@ import {ifRefPassApi} from "@/api/staff/store";
         let oilOrderR = []
         let balanceAmount = 0
         let oilCardAmount = 0
-        console.log("123123123",this.oilInfo)
 
 
         this.oilInfo.forEach(order=>{
@@ -787,7 +786,8 @@ import {ifRefPassApi} from "@/api/staff/store";
             let o = {
               oilName : order.name,
               unit : order.num+""+order.unit,
-              amount : order.memberPrice.toString()
+              // amount : order.memberPrice.toString()
+              amount : order.retailPrice.toString()
             }
             goodsOrderR.push(o)
           })
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index af095ed99..550b20b34 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -526,7 +526,8 @@ export default {
           let o = {
             oilName : order.name,
             unit : order.num+""+order.unit,
-            amount : order.memberPrice.toString()
+            // amount : order.memberPrice.toString()
+            amount : order.retailPrice.toString()
           }
           goodsOrderR.push(o)
         })
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index 423caf8e9..c5c76d61f 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -1508,7 +1508,7 @@ export default {
       await this.getSendPrintIndex(this.realyPayBills);
       this.openConfirm = true;
       this.isPay = true
-      this.getCode(this.realyPayBills)
+      this.getCode(this.realyPayBills,flag)
 
       this.title = this.payment
     },
@@ -2155,7 +2155,13 @@ export default {
     },
 
     // 网络下发之后获取条码
-    getCode(amount) {
+    getCode(amount,flag) {
+      if (this.cardValueForm.paymentType == "CASH" && flag == 1) {
+        return
+      }
+      if (this.cardFuelDieselForm.paymentType == "CASH" && flag == 2) {
+        return
+      }
       this.jishuqi++;
       if (this.jishuqi == 30) {
         this.jishuqi = 0
diff --git a/pos-uni/pages/index/index.vue b/pos-uni/pages/index/index.vue
index 6797843ad..a0adab181 100644
--- a/pos-uni/pages/index/index.vue
+++ b/pos-uni/pages/index/index.vue
@@ -77,12 +77,18 @@
 					<view class="right-centne">
 						<view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
 						</view>
-						<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
-						<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						<view class="h_"><text class="hao_">消费类型:</text>{{item.content}}</view>
+						<template v-if="item.content == '储值卡充值'">
+						</template>
+						<template v-else>
+							<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
+							<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						</template>
 						<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
-						<view class="b-bx">
+						<view class="b-bx" v-if="!item.content == '储值卡充值'">
 							<view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
-							<view class=""><text class="hao_">优惠:</text>￥0.00</view>
+							<view class=""><text class="hao_">优惠:</text>￥{{item.discountAmount?item.discountAmount:0}}
+							</view>
 						</view>
 					</view>
 				</view>
diff --git a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
index 0fc587036..baaa6f61f 100644
--- a/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
+++ b/pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue
@@ -322,6 +322,8 @@
 				this.order.authCode = this.authCode
 				this.order.realyPayBills = this.realyPayBills
 				this.order.actualPayment = actualPayment
+				this.order.payChannel = "POS"
+				this.order.terminal = "POS"
 				// cardValueId
 
 				// growthValue
diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue
index 838d72172..ef0c9b59b 100644
--- a/pos-uni/pagesHome/orderList/orderList.vue
+++ b/pos-uni/pagesHome/orderList/orderList.vue
@@ -25,12 +25,18 @@
 					<view class="right-centne">
 						<view class="h_"> <text class="hao_">订单号:</text> <text>{{item.orderNo}}</text>
 						</view>
-						<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
-						<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						<view class="h_"><text class="hao_">消费类型:</text>{{item.content}}</view>
+						<template v-if="item.content == '储值卡充值'">
+						</template>
+						<template v-else>
+							<view class="h_"><text class="hao_">油号:</text>{{item.oilName}}</view>
+							<view class="h_"><text class="hao_">升数:</text>{{item.shengshu}}L</view>
+						</template>
 						<view class="h_"><text class="hao_">下单时间:</text>{{item.payTime}}</view>
-						<view class="b-bx">
+						<view class="b-bx" v-if="!item.content == '储值卡充值'">
 							<view class=""> <text class="hao_">应付:</text>￥{{item.goodsMoney}}</view>
-							<view class=""><text class="hao_">优惠:</text>￥0.00</view>
+							<view class=""><text class="hao_">优惠:</text>￥{{item.discountAmount?item.discountAmount:0}}
+							</view>
 						</view>
 					</view>
 				</view>

From 0790d308005e94e0ccb8677e8563442a039b7f12 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 6 Jun 2024 17:32:14 +0800
Subject: [PATCH 2/2] no message

---
 pos-uni/pages/login/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pos-uni/pages/login/login.vue b/pos-uni/pages/login/login.vue
index 3464bde88..7843d5399 100644
--- a/pos-uni/pages/login/login.vue
+++ b/pos-uni/pages/login/login.vue
@@ -13,7 +13,7 @@
 					<view class="input_box">
 
 						<u-icon name="lock" color="#0864E9" size="22"></u-icon>
-						<input type="text" style="color: #333;" v-model="form.password" placeholder="请输入密码" />
+						<input type="password" style="color: #333;" v-model="form.password" placeholder="请输入密码" />
 					</view>
 
 					<view class="anniu" @click="goGoGo">