优化

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

@@ -50,6 +50,7 @@
 				<a-descriptions-item label="过磅重量" :span="2">{{ formData.netWeight +'吨'}}</a-descriptions-item>
 				<a-descriptions-item label="提货开始时间" :span="2">{{ formData.confStartTime}}</a-descriptions-item>
 				<a-descriptions-item label="提货结束时间" :span="2">{{ formData.confEndTime}}</a-descriptions-item>
+				<a-descriptions-item label="送货地址" :span="4">{{ formData.shipAddress}}</a-descriptions-item>
 				<a-descriptions-item label="签名" :span="4">
 					<a-image v-if="formData.orderSign != null" :width="200" :src="formData.orderSign" />
 				</a-descriptions-item>

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

@@ -440,6 +440,12 @@
 			align:'center',
 			width: 100
 		},
+		{
+			title: '送货地址',
+			dataIndex: 'shipAddress',
+			align:'center',
+			width: 100
+		},
 	]
 	// 操作栏通过权限判断是否显示
 	columns.push({

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

@@ -15,6 +15,7 @@ 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.date.DateUtil;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -124,6 +125,12 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
         if(ObjectUtil.isNotEmpty(bizOrderPageParam.getOrderSource())){
             queryWrapper.eq("bo.order_source",bizOrderPageParam.getOrderSource());
         }
+        //默认当日
+        if(ObjectUtil.isEmpty(bizOrderPageParam.getOrderNumber()) && ObjectUtil.isEmpty(bizOrderPageParam.getCustomerName())
+            && ObjectUtil.isEmpty(bizOrderPageParam.getGoodsName()) && ObjectUtil.isEmpty(bizOrderPageParam.getOrderStatus())){
+            String format = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
+            queryWrapper.between("bo.create_time",format+" 00:00:00",format+" 23:59:59");
+        }
         // 校验数据范围
         List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
         if(ObjectUtil.isEmpty(loginUserDataScope)) {

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizsaleorder/service/impl/BizSaleOrderServiceImpl.java

@@ -14,6 +14,7 @@ package vip.xiaonuo.biz.modular.bizsaleorder.service.impl;
 
 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.StrUtil;
 import cn.hutool.http.HttpException;
@@ -91,6 +92,13 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
         if(ObjectUtil.isNotEmpty(bizSaleOrderPageParam.getSaleGoodsName())){
             queryWrapper.like("bso.sale_goods_name",bizSaleOrderPageParam.getSaleGoodsName());
         }
+        if(ObjectUtil.isEmpty(bizSaleOrderPageParam.getSaleOrderNumber()) &&
+                ObjectUtil.isEmpty(bizSaleOrderPageParam.getSaleOrderType()) &&
+            ObjectUtil.isEmpty(bizSaleOrderPageParam.getSaleGoodsName())){
+            //如果筛选条件都是空，默认查询当日
+            String format = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
+            queryWrapper.between("bso.create_time",format+" 00:00:00",format+" 23:59:59");
+        }
         queryWrapper.eq("bso.delete_flag","NOT_DELETE");
         queryWrapper.orderByDesc("bso.create_time");
         return this.getBaseMapper().getPage(CommonPageRequest.defaultPage(), queryWrapper);