update

src/main/java/com/gogirl/application/order/mall/impl/MallOrderServiceImpl.java

@@ -23,7 +23,6 @@ import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderTechnicianMapper;
 import com.gogirl.infrastructure.mapper.product.mall.MallProductMapper;
 import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
-import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
 import com.gogirl.infrastructure.util.SessionUtils;
 import com.gogirl.shared.market.ListMallOrderRequest;
@@ -59,6 +58,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
     private final MallProductMapper mallProductMapper;
     private final CustomerMapper customerMapper;
     private final MallOrderTechnicianMapper mallOrderTechnicianMapper;
+    private final StoreManageMapper storeManageMapper;
 
     /**
      * domain service
@@ -297,8 +297,6 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
         mallOrderMapper.updateById(mallOrder);
     }
 
-    private final StoreTechnicianMapper storeTechnicianMapper;
-    private final StoreManageMapper storeManageMapper;
 
     @Override
     public void immediatePurchase(ImmediatePurchaseCommand cmd) {
@@ -435,10 +433,17 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
                 .stream()
                 .collect(Collectors.toMap(Customer::getId, customer -> customer, (k1, k2) -> k1));
 
+        Map<Integer, StoreManage> storeManageMap = storeManageMapper.selectList(new LambdaQueryWrapper<StoreManage>()
+                .in(StoreManage::getId, mallOrderIPage.getRecords().stream().map(MallOrder::getSelfTakeDepartmentId).collect(Collectors.toList())))
+                .stream()
+                .collect(Collectors.toMap(StoreManage::getId, storeManage -> storeManage, (k1, k2) -> k1));
+
+
         mallOrderIPage.getRecords().forEach(mallOrder -> {
             mallOrder.setMallOrderDetailList(mallOrderDetailMap.get(mallOrder.getId()));
             mallOrder.setMallOrderAddress(mallOrderAddressMap.get(mallOrder.getId()));
             mallOrder.setCustomer(customerMap.get(mallOrder.getCustomerId()));
+            mallOrder.setStoreManage(storeManageMap.get(mallOrder.getSelfTakeDepartmentId()));
         });
         return mallOrderIPage;
     }

src/main/java/com/gogirl/domain/order/mall/MallOrder.java

@@ -3,6 +3,7 @@ package com.gogirl.domain.order.mall;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gogirl.domain.store.store.StoreManage;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.user.customer.Customer;
 import io.swagger.annotations.ApiModel;
@@ -133,5 +134,8 @@ public class MallOrder {
     @TableField(exist = false)
     private Customer customer;
 
+    @TableField(exist = false)
+    private StoreManage storeManage;
+
 }
 

src/main/java/com/gogirl/interfaces/store/technician/StoreTechnicianController.java

@@ -2,11 +2,9 @@ package com.gogirl.interfaces.store.technician;
 
 import com.gogirl.application.store.store.StoreTechnicianService;
 import com.gogirl.application.store.store.StoreUserService;
-import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.store.store.StoreTechnician;
 import com.gogirl.domain.store.store.StoreUser;
 import com.gogirl.infrastructure.common.base.JsonResult;
-import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.service.file.FileService;
 import com.gogirl.infrastructure.util.SessionUtils;
 import io.swagger.annotations.Api;
@@ -23,16 +21,13 @@ import java.util.List;
 @Slf4j
 public class StoreTechnicianController {
 
-    @Resource
-    GogirlTokenService gogirlTokenService;
+
     @Resource
     private StoreUserService storeUserService;
     @Resource
-    StoreTechnicianService storeTechnicianService;
-    @Resource
-    GogirlProperties gogirlProperties;
+    private StoreTechnicianService storeTechnicianService;
     @Resource
-    FileService fileService;
+    private FileService fileService;
 
     @ApiOperation("/查询美甲师信息")
     @GetMapping("/customer/technician/getById")
@@ -43,16 +38,10 @@ public class StoreTechnicianController {
     @ApiOperation(value = "查询当前店铺的美甲师,选推荐人")
     @GetMapping("/technician/user/queryUserForAll")
     public JsonResult<List<StoreUser>> queryUserForAll() {
-
-        JsonResult<List<StoreUser>> jsonResult = new JsonResult<>();
         StoreUser storeUser = new StoreUser();
         storeUser.setDepartmentId(SessionUtils.getTechnicianToken().getDepartmentId());
         List<StoreUser> lists = storeUserService.listUserForAllNotQuit(storeUser);
-
-        jsonResult.setSuccess(JsonResult.CODE_SUCCESS)
-                .setMessage(JsonResult.APP_DEFINE_SUC)
-                .setData(lists);
-        return jsonResult;
+        return JsonResult.success(lists);
     }