ccjgmwz il y a 3 ans
Parent
commit
4e2af3ff79

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

@@ -140,6 +140,11 @@ public class ShopOrderServiceImpl implements IShopOrderService {
         }
         wrapper.eq("delete_flag", 0);
         List<ShopOrder> list = shopOrderMapper.selectPage(new RowBounds((page - 1) * limit, limit), wrapper);
+        for (ShopOrder shopOrder: list
+             ) {
+            ShopAccount shopAccount = shopAccountMapper.selectById(shopOrder.getAccountId());
+            shopOrder.setShopAccount(shopAccount);
+        }
         Integer count = shopOrderMapper.selectCount(wrapper);
         return new Page<ShopOrder>(list, page, limit, count);
     }

+ 1 - 0
unimall-admin/src/views/shop/order/index.vue

@@ -107,6 +107,7 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="店铺名称" align="center" prop="shopAccount.dangName" />
       <el-table-column label="孔网订单" align="center" prop="orderId" />
       <el-table-column label="当当订单" align="center" prop="dangOrder" />
       <el-table-column

+ 2 - 0
unimall-data/src/main/java/com/iotechn/unimall/data/domain/shop/ShopOrder.java

@@ -158,6 +158,8 @@ public class ShopOrder extends BaseDO{
     @TableField("admin_id")
     private Long adminId;
 
+    @TableField(exist = false)
+    private ShopAccount shopAccount;
 
     @TableField(exist = false)
     private List<ShopOrder> shopOrderList;