From a4411ed619503b20c59bc5a116e2facf48bd90ac Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 11 Jun 2024 17:29:44 +0800
Subject: [PATCH 1/2] no message

---
 .../src/views/staff/storeInfo/index.vue       | 21 ++--
 .../service/impl/AllOrderInfoServiceImpl.java | 12 ++-
 pos-uni/pagesHome/orderList/orderList.vue     | 99 +++++++++++++++++--
 3 files changed, 112 insertions(+), 20 deletions(-)

diff --git a/fuintAdmin/src/views/staff/storeInfo/index.vue b/fuintAdmin/src/views/staff/storeInfo/index.vue
index f626f7cbd..ea9d2d7b7 100644
--- a/fuintAdmin/src/views/staff/storeInfo/index.vue
+++ b/fuintAdmin/src/views/staff/storeInfo/index.vue
@@ -1,17 +1,19 @@
 <template>
   <div class="app-container">
-    <el-card class="card">
+    <el-row>
+      <el-col :span="12">
+        <el-card class="card">
       <div slot="header" class="clearfix">
         <span>{{ store.name }}{{store.description? "("+store.description+")":"" }}</span>
       </div>
 <!--      上传图片-->
       <div style="display: flex">
-        <span>店铺logo：</span>
+        <span style="margin-right: 10px">店铺logo：</span>
         <imgUpload1 v-if="flag" :imgUrl="store.logo" :limit="1" @input="getImgUrl"></imgUpload1>
       </div>
       <!--      上传图片-->
-      <div style="display: flex">
-        <span>门头照：</span>
+      <div style="display: flex;  ">
+        <span style="margin-right: 20px">门头照：</span>
         <imgUpload1 v-if="flag" :doorUrl="store.doorstepPhoto" @input="getDoorImgUrl"></imgUpload1>
       </div>
 
@@ -35,13 +37,14 @@
 
       <el-button type="primary" @click="submitStore">保存信息</el-button>
     </el-card>
-
-    <el-card class="card">
+      </el-col>
+      <el-col :span="12">
+        <el-card class="card" style="margin-left: 20px">
       <div slot="header" class="clearfix">
         <span>油站二维码</span>
       </div>
-      <el-button style="margin-left: 200px" type="text" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式</el-button><br/>
-      <el-button style="margin-left: 200px" type="text" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式</el-button><br/>
+      <el-button style="margin-left: 0px" type="text" v-if="type==0" @click="getQRCodeInfoByStoreId(1)">切换样式</el-button><br/>
+      <el-button style="margin-left: 0px" type="text" v-if="type==1" @click="getQRCodeInfoByStoreId(0)">切换样式</el-button><br/>
       <img id="collection" class="qrcode" :src="baseUrl + collectionImg" /><br/>
       <el-button class="but" type="primary"
                  icon="el-icon-download"
@@ -49,6 +52,8 @@
         下载油站二维码
       </el-button>
     </el-card>
+      </el-col>
+    </el-row>
 
 <!--    <el-card class="card">-->
 <!--      <div slot="header" class="clearfix">-->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index b52561d40..334bb1e4c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -104,7 +104,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
             //
             if (ObjectUtil.isNotEmpty(record.getUserId())) {
                 MtUser mtUser = mtUserMapper.queryMemberById(record.getUserId());
-                record.setAvatar(mtUser.getAvatar());
+                if (ObjectUtil.isNotEmpty(mtUser.getAvatar())) {
+                    record.setAvatar(mtUser.getAvatar());
+                }
             }
         }
         return pageList;
@@ -230,7 +232,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
                     map.put("payType",allOrderInfo.getPayType());
 
                     // 获取机构信息
-                    map.putAll(getMerchantConfig(allOrderInfo));
+
+//                    if ("CASH".equals(allOrderInfo.getPayType())){
+                        map.putAll(getMerchantConfig(allOrderInfo));
+//                    }
 
                 }else {
                     throw new RuntimeException("退款失败，无退款金额");
@@ -328,6 +333,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         Map<String, String> map = new HashMap<>();
         // 商户机构查询
         MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId());
+        if (ObjectUtil.isEmpty(merchantConfig)) {
+            throw new RuntimeException("未配置商户号");
+        }
         // 机构号
         map.put("insCd", merchantConfig.getInsCd());
         // 商户号
diff --git a/pos-uni/pagesHome/orderList/orderList.vue b/pos-uni/pagesHome/orderList/orderList.vue
index ef0c9b59b..805ed4f3c 100644
--- a/pos-uni/pagesHome/orderList/orderList.vue
+++ b/pos-uni/pagesHome/orderList/orderList.vue
@@ -3,10 +3,17 @@
 		<view class="container">
 			<headers :titles="titles" :type="titles" @chiledEvent="clickChild()">
 				<u-icon name="arrow-left" color="#fff" size="22">
-
 				</u-icon>
-
 			</headers>
+			<!-- 			<view class="my-header">
+				<view class="my-icons" @click="gobock()">
+					<slot></slot>
+				</view>
+				<view class="my-text">{{titles}}</view>
+			</view> -->
+
+
+
 			<view class="tablist">
 				<view class="tabbox" v-for="(item,index) in tablist" :key="index" @click="getindex(index)">
 					<view class="">{{item}}</view>
@@ -42,17 +49,18 @@
 				</view>
 				<view class="end-box">
 					实付:￥{{item.payMoney}}
-					<u-button v-if="item.orderStatus == 'paid'" style="width: 60px;" type="primary"
+					<u-button v-if="item.orderStatus == 'paid'"
+						style="width: 60px;float: right; margin-left: 5px; height: 21px	;" type="primary"
 						@click="openRef(item)" text="退款"></u-button>
 
 				</view>
 
 			</view>
 			<view style="width: 100%; height: 20px; "></view>
-
-
-			<u-popup :show="showPop" mode="right" @close="closePop" @open="openPop" customStyle="width: 300px;">
-				<view style="margin-top: 100px;">
+			<!-- customStyle="width: 300px;" -->
+			<!-- customStyle="full-screen-popup" -->
+			<u-popup :show="showPop" mode="right" @close="closePop" @open="openPop">
+				<view class="wrap_test" style="margin-top: 100px;">
 					<view class="time-bs">
 						<view class="time-box" @click="showStartTime = true">{{form.startTime?form.startTime:'开始日期'}}
 						</view>
@@ -65,8 +73,11 @@
 					</view>
 					<!-- 		<u--input class="time-bs2" placeholder="选择交易类型" border="surround" v-model="form.type"
 						@click="showType = true" disabled></u--input> -->
+					<view style="display: flex;justify-content: space-between;">
+						<u-button style="width: 100px;" type="primary" text="确定" @click="clickBu"></u-button>
+						<u-button style="width: 100px;" type="warning" text="取消" @click="clickBu2"></u-button>
+					</view>
 
-					<u-button style="width: 100px;" type="primary" text="确定" @click="clickBu"></u-button>
 				</view>
 
 
@@ -111,7 +122,7 @@
 				baseUrl: config.baseUrl,
 				form: {
 					page: 1,
-					pageSize: 10,
+					pageSize: 1000,
 					status: '',
 					startTime: '',
 					endTime: '',
@@ -207,7 +218,10 @@
 					data: form
 				}).then((res) => {
 					if (res.code == 200) {
-
+						uni.showToast({
+							title: "退款成功",
+							icon: "none"
+						})
 					} else {
 						uni.showToast({
 							title: res.data,
@@ -215,12 +229,17 @@
 						})
 					}
 					this.showModal = false
+					this.getPageListByPos();
 
 				})
 			},
 			goback() {
 				uni.navigateBack()
 			},
+			gobock() {
+				uni.navigateBack()
+			},
+
 			getPageListByPos() {
 				if (this.form.startTime && this.form.endTime) {
 					this.form.params = {
@@ -251,6 +270,19 @@
 				this.showPop = false
 				this.getPageListByPos()
 			},
+			clickBu2() {
+				this.showPop = false
+				this.form = {
+						page: 1,
+						pageSize: 1000,
+						status: '',
+						startTime: '',
+						endTime: '',
+						payType: ''
+					},
+					this.getPageListByPos()
+
+			},
 			closePop() {},
 			openPop() {},
 			clickType(e) {
@@ -430,6 +462,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-around;
+
 	}
 
 	.time-bs2 {
@@ -452,6 +485,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
+
 	}
 
 	.time-box2 {
@@ -471,4 +505,49 @@
 		font-weight: bold;
 		margin-right: 5px;
 	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		// background: linear-gradient(180deg, #B2D2FC 0%, rgba(255, 255, 255, 0.84) 100%);
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #fff;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+		z-index: 99999;
+		background: #0864e9;
+		position: fixed;
+		top: 0px;
+
+		.my-icons {
+			width: 50px;
+			height: 50px;
+		}
+
+		.my-text {
+			font-weight: bold;
+		}
+
+
+	}
+
+	.wrap_test {
+		width: 100vw;
+		height: 100vh;
+
+
+	}
+
+	.full-screen-popup {
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		margin: 0;
+		padding: 0;
+		box-sizing: border-box;
+	}
 </style>
\ No newline at end of file

From ce3cf53ade1e77dced71b85f1f381bf90b4bf31d Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 11 Jun 2024 17:30:08 +0800
Subject: [PATCH 2/2] no message

---
 pos-uni/config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pos-uni/config.js b/pos-uni/config.js
index 84307d3a0..75e44695e 100644
--- a/pos-uni/config.js
+++ b/pos-uni/config.js
@@ -4,7 +4,8 @@ module.exports = {
 	// baseUrl: 'http://192.168.0.196:8081/',
 	// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
 	// baseUrl: 'https://8q4f124343.yicp.fun/',
-	 baseUrl: 'http://192.168.31.96:8080/',
+	// baseUrl: 'http://192.168.31.96:8080/',
+	baseUrl: 'http://192.168.31.178:8081/',
 	// baseUrl: 'http://192.168.1.5:8002/cdJdc',
 	imagesUrl: 'http://www.nuoyunr.com/lananRsc',
 	// 应用信息