更新

unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/shop/IShopOrderService.java

@@ -46,6 +46,7 @@ public interface IShopOrderService {
             @HttpParam(name = "gmtUpdate", type = HttpParamType.COMMON, description = "") Date gmtUpdate,
             @HttpParam(name = "userId", type = HttpParamType.COMMON, description = "") Long userId,
             @HttpParam(name = "adminId", type = HttpParamType.COMMON, description = "") Long adminId,
+            @HttpParam(name = "shopName", type = HttpParamType.COMMON, description = "店铺名称") String shopName,
             @HttpParam(name = "pageNum", type = HttpParamType.COMMON, description = "页码", valueDef = "1") Integer page,
             @HttpParam(name = "pageSize", type = HttpParamType.COMMON, description = "页码长度", valueDef = "20") Integer limit)
             throws ServiceException;

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

@@ -85,10 +85,18 @@ public class ShopOrderServiceImpl implements IShopOrderService {
     }
 
     @Override
-    public Page<ShopOrder> list(Long accountId, String orderId, String dangOrder, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId, Integer page, Integer limit) throws ServiceException {
+    public Page<ShopOrder> list(Long accountId, String orderId, String dangOrder, String address, String provName, String cityName, String areaName, String orderStatus, String orderStatusName, String payStatus, String payName, String receiverName, String mobile, String receiver, Integer deleteFlag, Date gmtCreate, Date gmtUpdate, Long userId, Long adminId,String shopName, Integer page, Integer limit) throws ServiceException {
         Wrapper<ShopOrder> wrapper = new EntityWrapper<ShopOrder>();
-        if (!StringUtils.isEmpty(accountId)) {
-            wrapper.eq("account_id", accountId);
+        List<Long> param = new ArrayList<>();
+        if(!StringUtils.isEmpty(shopName)){
+            Wrapper<ShopAccount> wrapper1 = new EntityWrapper<ShopAccount>();
+            wrapper1.like("dang_name",shopName);
+            List<ShopAccount> list = shopAccountMapper.selectList(wrapper1);
+            for (ShopAccount shopAccount:list
+                 ) {
+                param.add(shopAccount.getId());
+            }
+            wrapper.in("account_id", param);
         }
         if (!StringUtils.isEmpty(orderId)) {
             wrapper.eq("order_id", orderId);

unimall-admin/src/views/shop/order/index.vue

@@ -6,6 +6,15 @@
       :inline="true"
       label-width="68px"
     >
+      <el-form-item label="店铺名称" prop="shopName">
+        <el-input
+          v-model="queryParams.shopName"
+          placeholder="请输入店铺名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="当当订单" prop="dangOrder">
         <el-input
           v-model="queryParams.dangOrder"
@@ -314,6 +323,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        shopName: undefined,
         accountId: undefined,
         orderId: undefined,
         dangOrder: undefined,