ccjgmwz 3 年之前
父节点
当前提交
9ab29ef0a7

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/impl/ShopOrderServiceImpl.java

@@ -125,7 +125,7 @@ public class ShopOrderServiceImpl implements IShopOrderService {
             wrapper.eq("order_status", orderStatus);
         }
         if (!StringUtils.isEmpty(orderStatusName)) {
-            wrapper.eq("order_status_name", orderStatusName);
+            wrapper.like("order_status_name", orderStatusName);
         }
         if (!StringUtils.isEmpty(payStatus)) {
             wrapper.eq("pay_status", payStatus);

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/user/AdminUserServiceImpl.java

@@ -174,7 +174,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         try{
             List<ShopOrder> shopOrders = shopOrderMapper.selectList(new EntityWrapper<ShopOrder>()
                     .eq("dang_order_status","未发货")
-//                    .eq("shipping_com",param)
+                    .eq("account_id",param)
                     .eq("order_status_name","卖家已发货"));
             for (ShopOrder qqq:shopOrders
             ) {

+ 11 - 2
unimall-admin/src/views/shop/order/index.vue

@@ -33,10 +33,19 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="当当发货状态" label-width="100px" prop="receiverName">
+      <el-form-item label="孔网状态" prop="orderStatusName">
+        <el-input
+          v-model="queryParams.orderStatusName"
+          placeholder="请输入孔网状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="当当状态" prop="dangOrderStatus">
         <el-input
           v-model="queryParams.dangOrderStatus"
-          placeholder="请输入当当发货状态"
+          placeholder="请输入当当状态"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"