免密登录

pine-admin/src/main/java/com/pine/admin/modules/business/controller/OrderController.java

@@ -84,7 +84,6 @@ public class OrderController extends BaseController {
             o.setShopName(o.getOrderSkus().get(0).getSkuName());
         });
         try {
-
             if (!allList.isEmpty()) {
                 String excelName = "商城全部订单";
                 LinkedHashMap<String, String> fieldMap = new LinkedHashMap<String, String>();

pine-admin/src/main/java/com/pine/admin/modules/business/entity/Order.java

@@ -408,6 +408,10 @@ public class Order implements Serializable {
      * 商品名称
      */
     private String shopName;
+    /**
+     * 商品名称
+     */
+    private String skuName;
     /**
      * 商拼编号
      */

pine-admin/src/main/resources/mapper/business/OrderDao.xml

@@ -333,10 +333,12 @@
         ls_customer.mobile,
         ls_order_attr.receipt_mobile as receiptMobile,
         ls_order_attr.receipt_name as receiptName,
-        concat(ls_order_attr.receipt_address,ls_order_attr.receipt_detail_address) as address
+        concat(ls_order_attr.receipt_address,ls_order_attr.receipt_detail_address) as address,
+        ls_order_sku.sku_name AS skuName
         from ls_order
         join ls_customer on ls_order.customer_id = ls_customer.id
-       left  join ls_order_attr on ls_order_attr.order_id = ls_order.id
+        left join ls_order_attr on ls_order_attr.order_id = ls_order.id
+        left join ls_order_sku on ls_order_sku.order_id = ls_order.id
         where ls_customer.del_flag = '0'
         and ls_order.store_id = 0
         and ls_order.status != 1
@@ -345,6 +347,9 @@
         <if test="record.receiptMobile != null and record.receiptMobile != '' ">
             and ls_order_attr.receipt_mobile = #{record.receiptMobile}
         </if>
+        <if test="record.skuName != null and record.skuName != '' ">
+            and  ls_order_sku.sku_name like CONCAT('%',CONCAT(#{record.skuName}),'%')
+        </if>
         <!-- 收货人姓名 -->
         <if test="record.receiptName != null and record.receiptName != '' ">
             and ls_order_attr.receipt_name like CONCAT(CONCAT('%', #{record.receiptName}),'%')
@@ -370,7 +375,7 @@
         </if>
 
         <if test='record.status != null and record.status != "" and  record.status!= "5"'>
-            AND ls_order.status =  #{record.status}
+            AND ls_order.status = #{record.status}
         </if>
         <if test='record.status=="5"'>
             AND ls_order.status in ('5','6','7')
@@ -400,7 +405,7 @@
     </select>
 
     <!-- 全部查询 -->
-    <select id="queryAll"  parameterType="java.util.Map"
+    <select id="queryAll" parameterType="java.util.Map"
             resultType="com.pine.admin.modules.business.entity.Order">
         select ls_order.*,
         ls_customer.username as customerName,