优化

snowy-admin-web/src/views/biz/bizappointmentrecord/detail.vue

@@ -50,7 +50,10 @@
 						{{ $TOOL.dictTypeData('appointment_status', formData.status) }}
 					</a-tag>
 				</a-descriptions-item>
-				<a-descriptions-item label="审核备注" :span="2">{{ formData.appointmentReason }}</a-descriptions-item>
+				<a-descriptions-item label="审核备注" :span="4">{{ formData.appointmentReason }}</a-descriptions-item>
+				<a-descriptions-item label="司机确认" :span="4">
+					<a-image :width="200" :src="formData.driverSign" />
+				</a-descriptions-item>
 			</a-descriptions>
 		</a-form>
 	</xn-form-container>

snowy-admin-web/src/views/biz/bizappointmentrecord/index.vue

@@ -179,6 +179,9 @@
 									<a-menu-item v-if="hasPerm('bizAppointmentRecordDelete') && (record.status == '2')">
 										<a style="color:red" type="link" danger size="small" @click="deleteConfig(record)">删除</a>
 									</a-menu-item>
+									<a-menu-item v-if="hasPerm('bizAppointmentDriverConfim') && record.status == '8'">
+										<a @click="XnSignNameRef.show(record.recordId)" >确认</a>
+									</a-menu-item>
 
 								</a-menu>
 							</template>
@@ -192,7 +195,7 @@
 	<Review ref="reviewRef" @successful="tableRef.refresh(true)" />
 	<Detail ref="detailRef" @successful="tableRef.refresh()" />
 
-
+	<XnSignName ref="XnSignNameRef" :image="searchFormState.driverSign" @successful="signSuccess" />
 	<a-modal v-model:visible="open" title="二维码" width="600px" style="height: 700px">
 		<div id="qrcode" style="text-align: center; margin:  15px 5px 15px 5px">
 			<a-row>
@@ -231,6 +234,7 @@
 	import QRCode from 'qrcode'
 	import html2canvas from 'html2canvas'
 	import downloadUtil from '@/utils/downloadUtil'
+	import bizRecordApi from '@/api/biz/bizRecordApi'
 
 	const submitLoading = ref(false)
 	const tableRef = ref()
@@ -240,6 +244,7 @@
 	const toolConfig = { refresh: true, height: true, columnSetting: true, striped: false }
 
 	const nowRecord = ref()
+	const XnSignNameRef = ref()
 
 	//查询数据
 	const searchFormState = ref({})
@@ -289,7 +294,8 @@
 		{
 			title: '车辆轴数',
 			dataIndex: 'axleNumber',
-			width: 110
+			width: 110,
+			align:'center'
 		},
 		{
 			title: '状态',
@@ -453,6 +459,17 @@
 			downloadUtil.resultDownload(res)
 		})
 	}
+
+	// 签名板组件回调
+	const signSuccess = (value) => {
+		const param = {
+			id:value.id,
+			driverSign: value.value
+		}
+		bizRecordApi.updateDriverSign(param).then(() => {
+			tableRef.value.refresh(true)
+		})
+	}
 </script>
 
 <style lang="less" scoped>

snowy-admin-web/src/views/biz/bizorder/detail.vue

@@ -53,6 +53,8 @@
 				<a-descriptions-item label="签名" :span="4">
 					<a-image v-if="formData.orderSign != null" :width="200" :src="formData.orderSign" />
 				</a-descriptions-item>
+				<a-descriptions-item label="结束备注" :span="4">{{ formData.endReason}}</a-descriptions-item>
+				<a-descriptions-item label="审核备注" :span="4">{{ formData.orderReason}}</a-descriptions-item>
 			</a-descriptions>
 		</a-form>
 	</xn-form-container>

snowy-admin-web/src/views/biz/bizorder/index.vue

@@ -133,8 +133,7 @@
 
 					<a-divider type="vertical" v-if="record.orderStatus == '3' || record.orderStatus == '4'"/>
 
-					<a-dropdown v-if="(hasPerm('bizOrderEdit')) || (hasPerm('bizOrderDelete'))
-						">
+					<a-dropdown>
 						<a class="ant-dropdown-link">
 							更多
 							<DownOutlined />

snowy-admin-web/src/views/biz/bizqueuerecord/index.vue

@@ -88,7 +88,10 @@
 					</div>
 				</template>
 				<template v-if="column.dataIndex === 'timeInfo'">
-					<span>{{record.beginTime + '~' + record.endTime}}</span>
+					<div class="time-list">
+						<p>开始时间：{{ record.beginTime }}</p>
+						<p style="margin-bottom: 0">结束时间：{{ record.endTime }}</p>
+					</div>
 				</template>
 				<template v-if="column.dataIndex === 'customerInfo'">
 					<span>{{record.customerName}}</span>
@@ -181,7 +184,7 @@
 	//查询数据
 	const searchFormState = ref({appointmentFlag:'1'})
 	const searchFormRef = ref()
-	const statusList = tool.dictList('appointment_status')
+	const statusList = tool.dictList('queue_status')
 
 	// 查询区域显示更多控制
 	const advanced = ref(false)
@@ -193,7 +196,7 @@
 		{
 			title: '订单信息',
 			dataIndex: 'orderInfo',
-			width:230
+			width:200
 		},
 		{
 			title: '车牌号',
@@ -202,32 +205,32 @@
 			align: 'center'
 		},
 		{
-			title: '提货开始时间',
-			dataIndex: 'beginTime',
-			align:'center',
-			width:180
-		},
-		{
-			title: '提货结束时间',
-			dataIndex: 'endTime',
+			title: '提货时间',
+			dataIndex: 'timeInfo',
 			align:'center',
-			width:180
+			width:200
 		},
 		{
 			title: '客户信息',
 			dataIndex: 'customerInfo',
 			align:'center',
-			width:200
+			width:180
 		},
 		{
 			title: '货品信息',
 			dataIndex: 'goodsInfo',
-			width:180
+			width:160
 		},
 		{
 			title: '司机信息',
 			dataIndex: 'driverInfo',
-			width: 180
+			width: 160
+		},
+		{
+			title: '排队号',
+			dataIndex: 'queueNumber',
+			width: 110,
+			align:'center'
 		},
 		{
 			title: '状态',

snowy-admin-web/src/views/biz/bizsaleorder/index.vue

@@ -14,7 +14,7 @@
 				</a-col>
 				<a-col :span="6">
 					<a-form-item label="订单类型" name="saleOrderType">
-						<a-select v-model:value="searchFormState.saleOrderType" placeholder="订单状态查询"
+						<a-select v-model:value="searchFormState.saleOrderType" placeholder="订单类型查询"
 								  :options="orderTypeList"
 						> </a-select>
 					</a-form-item>

snowy-admin-web/src/views/biz/bizsendrecord/index.vue

@@ -2,6 +2,11 @@
 	<a-card :bordered="false" style="margin-bottom: 10px" class="mb-2">
 		<a-form ref="searchFormRef" name="advanced_search" :model="searchFormState" class="ant-advanced-search-form">
 			<a-row :gutter="24">
+				<a-col :span="6">
+					<a-form-item label="车次编码" name="carNumber">
+						<a-input v-model:value="searchFormState.carNumber" placeholder="请输入车次编码" />
+					</a-form-item>
+				</a-col>
 				<a-col :span="6">
 					<a-form-item label="车牌号码" name="licensePlate">
 						<a-input v-model:value="searchFormState.licensePlate" placeholder="请输入车牌号码" />
@@ -15,14 +20,6 @@
 						/>
 					</a-form-item>
 				</a-col>
-				<a-col :span="6">
-					<a-form-item label="过皮时间" name="tareTime">
-						<a-range-picker
-							v-model:value="searchFormState.tareTime"
-							value-format="YYYY-MM-DD"
-						/>
-					</a-form-item>
-				</a-col>
 				<a-col :span="6" v-show="advanced">
 					<a-form-item label="司机姓名" name="driverName">
 						<a-input v-model:value="searchFormState.driverName" placeholder="请输入司机姓名" />
@@ -43,7 +40,7 @@
 						<a-input v-model:value="searchFormState.goodsModel" placeholder="请输入规格型号" />
 					</a-form-item>
 				</a-col>
-				<a-col :span="6" v-show="advanced">
+<!--				<a-col :span="6" v-show="advanced">
 					<a-form-item label="收货单位" name="receiptCompany">
 						<a-input v-model:value="searchFormState.receiptCompany" placeholder="请输入收货单位" />
 					</a-form-item>
@@ -57,7 +54,7 @@
 					<a-form-item label="运输单位" name="transportCompany">
 						<a-input v-model:value="searchFormState.transportCompany" placeholder="请输入运输单位" />
 					</a-form-item>
-				</a-col>
+				</a-col>-->
 				<a-col :span="6" v-show="advanced">
 					<a-form-item label="订单编号" name="orderNumber">
 						<a-input v-model:value="searchFormState.orderNumber" placeholder="请输入订单编号" />
@@ -232,8 +229,9 @@
 			dataIndex: 'orderInfo'
 		},
 		{
-			title: '收发货单位',
-			dataIndex: 'company'
+			title: '客户名称',
+			dataIndex: 'customerName',
+			align:'center'
 		},
 		{
 			title: '货品',
@@ -246,14 +244,13 @@
 		}
 	]
 	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizRecordEdit', 'bizRecordDelete', 'bizRecordDetail'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
+	columns.push({
+		title: '操作',
+		dataIndex: 'action',
+		align: 'center',
+		width: 150
+	})
+
 
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)

snowy-admin-web/src/views/biz/record/detail.vue

@@ -10,9 +10,9 @@
 			<a-descriptions-item span="3" label="车次编码">{{ formData.carNumber }}</a-descriptions-item>
 			<a-descriptions-item label="车牌号码">{{ formData.licensePlate }}</a-descriptions-item>
 			<a-descriptions-item span="2" label="车牌颜色">{{ formData.plateColor }}</a-descriptions-item>
-			<a-descriptions-item label="发货单位">{{ formData.shippingCompany }}</a-descriptions-item>
+<!--			<a-descriptions-item label="发货单位">{{ formData.shippingCompany }}</a-descriptions-item>
 			<a-descriptions-item label="收货单位">{{ formData.receiptCompany }}</a-descriptions-item>
-			<a-descriptions-item label="运输单位">{{ formData.transportCompany }}</a-descriptions-item>
+			<a-descriptions-item label="运输单位">{{ formData.transportCompany }}</a-descriptions-item>-->
 			<!-- <a-descriptions-item label="运输路线">{{ formData.transportRoute }}</a-descriptions-item> -->
 			<a-descriptions-item label="货品名称">{{ formData.goodsName }}</a-descriptions-item>
 			<a-descriptions-item label="货品规格">{{ formData.goodsModel }}</a-descriptions-item>
@@ -27,13 +27,13 @@
 		<a-divider></a-divider>
 		<a-descriptions>
 			<a-descriptions-item label="毛重"
-				><a-tag color="blue">{{ formData.grossWeight }} KG</a-tag></a-descriptions-item
+				><a-tag color="blue">{{ formData.grossWeight }} 吨</a-tag></a-descriptions-item
 			>
 			<a-descriptions-item label="皮重"
-				><a-tag color="orange">{{ formData.tareWeight }} KG</a-tag></a-descriptions-item
+				><a-tag color="orange">{{ formData.tareWeight }} 吨</a-tag></a-descriptions-item
 			>
 			<a-descriptions-item label="净重"
-				><a-tag color="green">{{ formData.netWeight }} KG</a-tag></a-descriptions-item
+				><a-tag color="green">{{ formData.netWeight }} 吨</a-tag></a-descriptions-item
 			>
 		</a-descriptions>
 		<a-divider></a-divider>

snowy-admin-web/src/views/biz/record/index.vue

@@ -49,7 +49,7 @@
 							<a-input v-model:value="searchFormState.goodsModel" placeholder="请输入规格型号" />
 						</a-form-item>
 					</a-col>
-					<a-col :span="6" v-show="advanced">
+<!--					<a-col :span="6" v-show="advanced">
 						<a-form-item label="收货单位" name="receiptCompany">
 							<a-input v-model:value="searchFormState.receiptCompany" placeholder="请输入收货单位" />
 						</a-form-item>
@@ -63,7 +63,7 @@
 						<a-form-item label="运输单位" name="transportCompany">
 							<a-input v-model:value="searchFormState.transportCompany" placeholder="请输入运输单位" />
 						</a-form-item>
-					</a-col>
+					</a-col>-->
 					<a-col :span="6" v-show="advanced">
 						<a-form-item label="订单编号" name="orderNumber">
 							<a-input v-model:value="searchFormState.orderNumber" placeholder="请输入订单编号" />
@@ -177,7 +177,7 @@
 					<a-space>
 						<a @click="detailRef.onOpen(record)">详情</a>
 						<a-divider type="vertical" v-if="hasPerm('bizRecordDriverConfirm')" />
-						<a @click="XnSignNameRef.show(record.id)" v-if="hasPerm('bizRecordDriverConfirm') && record.status == '8'">司机确认</a>
+<!--						<a @click="XnSignNameRef.show(record.id)" v-if="hasPerm('bizRecordDriverConfirm') && record.status == '8'">司机确认</a>-->
 						<XnSignName ref="XnSignNameRef" :image="searchFormState.driverSign" @successful="signSuccess" />
 						<a-divider type="vertical" v-if="hasPerm(['bizGoodsEdit', 'bizGoodsDelete'], 'and')" />
 						<a-popconfirm title="确定要删除吗？" @confirm="cancellationBizRecord(record)">
@@ -230,7 +230,7 @@
 			width: '130px'
 		},
 		{
-			title: '重量（KG）',
+			title: '重量（吨）',
 			dataIndex: 'weight',
 			align: 'center'
 		},
@@ -239,8 +239,9 @@
 			dataIndex: 'orderInfo'
 		},
 		{
-			title: '收发货单位',
-			dataIndex: 'company'
+			title: '客户名称',
+			dataIndex: 'customerName',
+			align:'center'
 		},
 		{
 			title: '货品',
@@ -253,14 +254,13 @@
 		}
 	]
 	// 操作栏通过权限判断是否显示
-	if (hasPerm(['bizRecordEdit', 'bizRecordDelete', 'bizRecordDetail'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
+	columns.push({
+		title: '操作',
+		dataIndex: 'action',
+		align: 'center',
+		width: 150
+	})
+
 
 	const loadData = (parameter) => {
 		const searchFormParam = cloneDeep(searchFormState.value)

snowy-plugin-api/snowy-plugin-auth-api/src/main/java/vip/xiaonuo/auth/core/pojo/SaBaseLoginUser.java

@@ -247,6 +247,9 @@ public abstract class SaBaseLoginUser {
     @Schema(description = "用户密码hash值")
     private String password;
 
+    /**客户id*/
+    private String customerId;
+
     /** 是否可登录，由继承类实现 */
     public abstract Boolean getEnabled();
 

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/entity/BizAppointmentRecord.java

@@ -120,4 +120,11 @@ public class BizAppointmentRecord extends CommonEntity {
     /**过磅记录id*/
     @TableField(exist = false)
     private String recordId;
+
+    /**排队号*/
+    private Integer queueNumber;
+
+    @TableField(exist = false)
+    /**司机签名*/
+    private String driverSign;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/mapper/mapping/BizAppointmentRecordMapper.xml

@@ -21,7 +21,9 @@
             bar.appointment_reason,
             bar.over_id,
             bec.vehicle_axle_number axleNumber,
-            br.id recordId
+            br.id recordId,
+            bar.queue_number,
+            br.driver_sign
         from biz_appointment_record bar
          left join biz_order bo on bar.order_id = bo.id
          left join biz_goods bg on bg.id = bo.good_id

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/param/BizAppointmentExportResult.java

@@ -26,8 +26,12 @@ public class BizAppointmentExportResult {
 
     /** 预约时段 */
     @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
-    @ExcelProperty({"预约报表", "提货时段"})
-    private String timeInfo;
+    @ExcelProperty({"预约报表", "提货开始时间"})
+    private String beginTime;
+    /** 预约时段 */
+    @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
+    @ExcelProperty({"预约报表", "提货结束时间"})
+    private String endTime;
 
     /** 客户名称 */
     @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
@@ -54,6 +58,11 @@ public class BizAppointmentExportResult {
     @ExcelProperty({"预约报表", "司机电话"})
     private String driverMobile;
 
+    /** 司机电话 */
+    @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
+    @ExcelProperty({"预约报表", "车辆轴数"})
+    private String axleNumber;
+
     /** 预约状态*/
     @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 120)
     @ExcelProperty({"预约报表", "预约状态"})

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/service/impl/BizAppointmentRecordServiceImpl.java

@@ -15,6 +15,7 @@ package vip.xiaonuo.biz.modular.bizappointmentrecord.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.StrUtil;
@@ -58,6 +59,7 @@ import vip.xiaonuo.biz.modular.bizappointmentrecord.service.BizAppointmentRecord
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
 /**
@@ -69,6 +71,7 @@ import java.util.regex.Pattern;
 @Service
 public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentRecordMapper, BizAppointmentRecord> implements BizAppointmentRecordService {
 
+    private final ReentrantLock lock = new ReentrantLock();
     @Resource
     private BizConfigService bizConfigService;
     @Resource
@@ -103,7 +106,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
             queryWrapper.like("bo.order_number",bizAppointmentRecordPageParam.getOrderNumber());
         }
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordPageParam.getCustomerName())){
-            queryWrapper.like("bc.customer_name",bizAppointmentRecordPageParam.getCustomerName());
+            queryWrapper.like("bc.name",bizAppointmentRecordPageParam.getCustomerName());
         }
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordPageParam.getDriverName())){
             queryWrapper.like("bar.driver_name",bizAppointmentRecordPageParam.getDriverName());
@@ -112,7 +115,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
             queryWrapper.like("bar.driver_mobile",bizAppointmentRecordPageParam.getDriverMobile());
         }
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordPageParam.getGoodsName())){
-            queryWrapper.like("bg.NAME",bizAppointmentRecordPageParam.getGoodsName());
+            queryWrapper.like("bg.GOODS_NAME",bizAppointmentRecordPageParam.getGoodsName());
         }
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordPageParam.getLicenseNumber())){
             queryWrapper.like("bar.license_number",bizAppointmentRecordPageParam.getLicenseNumber());
@@ -151,7 +154,8 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
                 bizAppointmentRecord.setStatus("3");
             }
         }
-        this.save(bizAppointmentRecord);
+        //this.save(bizAppointmentRecord);
+        saveRecord(bizAppointmentRecord);
 
         BizOrder bizOrder = bizOrderService.getById(bizAppointmentRecordAddParam.getOrderId());
         bizOrder.setOrderStatus("4");
@@ -167,6 +171,22 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
         }
     }
 
+    public void saveRecord(BizAppointmentRecord bizAppointmentRecord){
+        //排队中
+        lock.lock();
+        try {
+            //查询当天预约记录条数
+            String format = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
+            long count = this.count(new QueryWrapper<BizAppointmentRecord>().lambda().
+                    between(BizAppointmentRecord::getCreateTime, format + " 00:00:00", format + " 23:59:59"));
+            bizAppointmentRecord.setQueueNumber((int) (count+1));
+            this.save(bizAppointmentRecord);
+        } finally {
+            lock.unlock(); // 释放锁
+        }
+
+    }
+
     public void checkParam(BizAppointmentRecordAddParam bizAppointmentRecordAddParam){
         //校验车牌号
         if(ObjectUtil.isNotEmpty(bizAppointmentRecordAddParam.getLicenseNumber())){
@@ -375,7 +395,7 @@ public class BizAppointmentRecordServiceImpl extends ServiceImpl<BizAppointmentR
             BizAppointmentExportResult bizAppointmentExportResult = new BizAppointmentExportResult();
             BeanUtil.copyProperties(bizAppointmentRecord, bizAppointmentExportResult);
             bizAppointmentExportResult.setStatusName((String) bizAppointmentRecord.getTransMap().get("statusName"));
-            bizAppointmentExportResult.setTimeInfo(bizAppointmentRecord.getBeginTime()+"~"+bizAppointmentRecord.getEndTime());
+            bizAppointmentExportResult.setAxleNumber(bizAppointmentRecord.getAxleNumber()+"轴");
             list.add(bizAppointmentExportResult);
         }
         CommonExportUtil.export(fileName, BizAppointmentExportResult.class,list,response,"预约报表");

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/mapper/mapping/BizOrderMapper.xml

@@ -24,7 +24,9 @@
             bgc.CONF_END_TIME,
             bo.sale_order_info,
             bo.delivery_time_id,
-            bo.order_sign
+            bo.order_sign,
+            bo.order_reason,
+            bo.end_reason
         from biz_order bo
         left join biz_customer bc on bo.customer_id = bc.id
         left join biz_goods bg on bg.id = bo.good_id

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizorder/service/impl/BizOrderServiceImpl.java

@@ -12,11 +12,13 @@
  */
 package vip.xiaonuo.biz.modular.bizorder.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,6 +29,8 @@ import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.api.SaBaseLoginUserApi;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
 import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
 import vip.xiaonuo.biz.modular.bizorderconfig.entity.BizOrderConfig;
@@ -51,6 +55,7 @@ import java.math.BigDecimal;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 订单管理Service接口实现类
@@ -79,6 +84,9 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
     @Resource
     private BizSaleOrderService bizSaleOrderService;
 
+    @Resource(name = "loginUserApi")
+    private SaBaseLoginUserApi loginUserApi;
+
     @Override
     public Page<BizOrder> page(BizOrderPageParam bizOrderPageParam) {
         QueryWrapper<BizOrder> queryWrapper = getQueryWrapper(bizOrderPageParam);
@@ -111,6 +119,11 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
         if(ObjectUtil.isNotEmpty(bizOrderPageParam.getOrderSource())){
             queryWrapper.eq("bo.order_source",bizOrderPageParam.getOrderSource());
         }
+        // 校验数据范围
+        List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
+        if(ObjectUtil.isEmpty(loginUserDataScope)) {
+            queryWrapper.eq("bo.customer_id", StpLoginUserUtil.getLoginUser().getCustomerId());
+        }
         queryWrapper.eq("bo.delete_flag","NOT_DELETE");
         queryWrapper.orderByDesc("bo.create_time");
         return queryWrapper;

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/mapper/mapping/BizRecordMapper.xml

@@ -267,7 +267,57 @@
 
     <select id="getPage" resultType="vip.xiaonuo.biz.modular.record.entity.BizRecord">
         select
-            br.*,
+            br.ID,
+            br.RELATION_ID,
+            br.LICENSE_PLATE,
+            br.PLATE_COLOR,
+            br.CAR_NUMBER,
+            br.GROSS_TIME,
+            br.TARE_TIME,
+            br.TARE_TYPE,
+            br.GROSS_WEIGHT/1000 GROSS_WEIGHT,
+            br.TARE_WEIGHT/1000 TARE_WEIGHT,
+            br.NET_WEIGHT/1000 NET_WEIGHT,
+            br.KF_WEIGHT/1000 KF_WEIGHT,
+            br.DRIVER_NAME,
+            br.DRIVER_MOBILE,
+            br.GOODS_NAME,
+            br.GOODS_MODEL,
+            br.RECEIPT_COMPANY,
+            br.SHIPPING_COMPANY,
+            br.TRANSPORT_COMPANY,
+            br.TRANSPORT_ROUTE,
+            br.GROSS_PLATE_NAME,
+            br.GROSS_LICENSE_NAME,
+            br.GROSS_CAPTURE_HEAD,
+            br.GROSS_CAPTURE_TAIL,
+            br.GROSS_CAPTURE_WARE,
+            br.GROSS_CAPTURE_BODY,
+            br.GROSS_CAPTURE_POUND_ROOM,
+            br.TARE_PLATE_NAME,
+            br.TARE_LICENSE_NAME,
+            br.TARE_CAPTURE_HEAD,
+            br.TARE_CAPTURE_TAIL,
+            br.TARE_CAPTURE_WARE,
+            br.TARE_CAPTURE_BODY,
+            br.TARE_CAPTURE_POUND_ROOM,
+            br.EXT_KEY1,
+            br.EXT_KEY2,
+            br.DELETE_FLAG,
+            br.CREATE_TIME,
+            br.CREATE_USER,
+            br.UPDATE_TIME,
+            br.UPDATE_USER,
+            br.weighing_type,
+            br.appointment_id,
+            br.order_id,
+            br.confirm_user,
+            br.appointment_user,
+            br.driver_sign,
+            br.unload_weight,
+            br.unload_img,
+            br.unload_name,
+            br.audit_sign,
             bo.order_name,
             bo.order_number,
             bc.name customerName,

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/record/service/impl/BizRecordServiceImpl.java

@@ -156,7 +156,7 @@ public class BizRecordServiceImpl extends ServiceImpl<BizRecordMapper, BizRecord
             queryWrapper.like("bo.order_number",bizRecordPageParam.getOrderNumber());
         }
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getCustomerName())){
-            queryWrapper.like("bc.customer_name",bizRecordPageParam.getCustomerName());
+            queryWrapper.like("bc.name",bizRecordPageParam.getCustomerName());
         }
         if (ObjectUtil.isNotEmpty(bizRecordPageParam.getOrderId())){
             queryWrapper.eq("br.order_id",bizRecordPageParam.getOrderId());

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java

@@ -288,4 +288,7 @@ public class SysUser extends CommonEntity {
 
     @Schema(description = "用户类型 1:客户账号   2：司机账号")
     private String userType;
+
+    /**客户id*/
+    private String customerId;
 }