产品名称 下单时间

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -137,9 +137,13 @@ public class LiveOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('live:liveOrder:queryAddress')")
     public R getAddress(@PathVariable("id") Long id)
     {
-        LiveOrder order = liveOrderService.selectLiveOrderByOrderId(String.valueOf(id));
-        String address = order.getUserAddress();
-        return R.ok().put("address",address);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser.getUser().getUserType().equals("00")){
+            LiveOrder order = liveOrderService.selectLiveOrderByOrderId(String.valueOf(id));
+            String address = order.getUserAddress();
+            return R.ok().put("address",address);
+        }
+        return R.error("无权查看");
     }
     @GetMapping(value = "/queryPhone/{id}")
     @PreAuthorize("@ss.hasPermi('live:liveOrder:queryPhone')")

fs-service-system/src/main/java/com/fs/live/vo/LiveOrderQueryVO.java

@@ -336,6 +336,15 @@ public class LiveOrderQueryVO extends BaseEntity {
      */
     private String deliverySendTimeEnd;
 
+    /**
+     * 订单创建时间-开始（下单时间，筛选用，格式 yyyy-MM-dd，查询时拼接 00:00:00）
+     */
+    private String createTimeStart;
+    /**
+     * 订单创建时间-结束（下单时间，筛选用，格式 yyyy-MM-dd，查询时拼接 23:59:59）
+     */
+    private String createTimeEnd;
+
     /** 是否可售后 */
 //    @Excel(name = "是否可售后")
     private Integer isAfterSales;

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderItemMapper.java

@@ -78,6 +78,9 @@ public interface FsStoreOrderItemMapper
             " left join company_user cu on cu.user_id=o.company_user_id " +
             " left join company_tcm_schedule cts on cts.id = o.schedule_id " +
             " left join fs_store_delivers deliver on o.id=deliver.order_id " +
+            "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
+            " left join fs_store_product fsp on i.product_id = fsp.product_id " +
+            "</if>" +
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +
@@ -140,6 +143,9 @@ public interface FsStoreOrderItemMapper
             "<if test = 'maps.scheduleId != null    '> " +
             "and o.schedule_id =#{maps.scheduleId} " +
             "</if>" +
+            "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
+            "and fsp.product_name like concat('%', #{maps.productName}, '%') " +
+            "</if>" +
             " order by o.id desc limit 50000"+
             "</script>"})
     List<FsStoreOrderItemExportVO> selectFsStoreOrderItemListExportVO(@Param("maps")FsStoreOrderParam fsStoreOrder);

fs-service-system/src/main/java/com/fs/store/mapper/FsStoreOrderMapper.java

@@ -553,6 +553,9 @@ public interface FsStoreOrderMapper
             " from fs_store_order o  left JOIN fs_store_product_package p on o.package_id=p.package_id left join fs_user u on o.user_id=u.user_id  " +
             " left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join crm_customer cc on cc.customer_id=o.customer_id left join company_tcm_schedule cts on cts.id = o.schedule_id " +
             " left join fs_store_delivers deliver on deliver.order_id=o.id "+
+            "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
+            " left join fs_store_order_item oi on o.id = oi.order_id left join fs_store_product fsp on fsp.product_id = oi.product_id " +
+            "</if>" +
             "where 1=1 " +
             "<if test = 'maps.orderCode != null and  maps.orderCode !=\"\"    '> " +
             "and o.order_code like CONCAT('%',#{maps.orderCode},'%') " +
@@ -633,7 +636,13 @@ public interface FsStoreOrderMapper
             "<if test = 'maps.isUpload != null and maps.isUpload == 1    '> " +
             "and o.certificates is not null " +
             "</if>" +
+            "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
+            "and fsp.product_name like concat('%', #{maps.productName}, '%') " +
+            "</if>" +
             " ${maps.params.dataScope} "+
+            "<if test = 'maps.productName != null and maps.productName != \"\" '> " +
+            " group by o.id " +
+            "</if>" +
             " order by o.id desc limit 50000"+
             "</script>"})
     List<FsStoreOrderExportVO> selectFsStoreOrderListVOByExport(@Param("maps") FsStoreOrderParam param);

fs-service-system/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.delivery_pay_money,	a.delivery_import_time,	a.delivery_send_time,	a.is_after_sales,	a.dept_id,
         a.channel,	a.source,	a.bill_price,	a.total_postage,	a.pay_postage,	a.gain_integral,
         a.use_integral,	a.pay_integral,	a.back_integral,	a.is_edit_money,	b.product_info as product_introduce,a.customer_id,
-        b.product_name as product_name,a.total_price - a.pay_money as delivery_collection_amount
+        b.product_name as product_name,'0' as delivery_collection_amount
         FROM
         live_order a LEFT JOIN fs_store_product b ON a.product_id = b.product_id
         left join company_user cu on a.company_user_id = cu.user_id
@@ -170,6 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payStartTime != null and payEndTime != null and payStartTime!='' and payEndTime!=''">
                 and a.pay_time between CONCAT(#{payStartTime}, ' 00:00:00') and CONCAT(#{payEndTime}, ' 23:59:59')
             </if>
+            <if test="createTimeStart != null and createTimeEnd != null and createTimeStart != '' and createTimeEnd != ''">
+                and a.create_time between CONCAT(#{createTimeStart}, ' 00:00:00') and CONCAT(#{createTimeEnd}, ' 23:59:59')
+            </if>
             <if test="finishTimeStart != null and finishTimeEnd != null and finishTimeStart != '' and finishTimeEnd!=''">
                 and a.finish_time between CONCAT(#{finishTimeStart}, ' 00:00:00') and CONCAT(#{finishTimeEnd}, ' 23:59:59')
             </if>

fs-service-system/src/main/resources/mapper/store/FsStoreOrderMapper.xml

@@ -537,7 +537,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.`order_type`,
         o.`package_id`,
         o.`finish_time`,
-        o.`delivery_status`,
         o.`delivery_pay_status`,
         o.`delivery_time`,
         o.`delivery_pay_time`,