From 76799c62ab98c615156631d46c5b1f55b7a1df0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 14 Aug 2024 16:55:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=A2=84=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/controller/ArtificerController.java    |  9 +++++++++
 .../modules/bl/massage/entity/MassagePackage.java    |  4 ++++
 .../service/impl/MassagePackageServiceImpl.java      | 12 +++++++++++-
 .../sqx/modules/trip/controller/TripController.java  |  6 ++++++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
index 4477c2d..8f34d2a 100644
--- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
+++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
@@ -333,6 +333,15 @@ public class ArtificerController {
         return ordersService.updateArtificerCreditScore(type, creditScore, artificerId);
     }
 
+    @PostMapping("/updateArtificerCity")
+    @ApiOperation("修改技师城市")
+    public Result updateArtificerCity(String city, Long artificerId){
+        Artificer artificer = artificerService.getById(artificerId);
+        artificer.setCity(city);
+        artificerService.updateById(artificer);
+        return Result.success();
+    }
+
     @Scheduled(cron = "0 */1 * * * ?")
     public void endOrders(){
         ordersService.endOrders();
diff --git a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java
index 9f86675..94d883a 100644
--- a/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java
+++ b/src/main/java/com/sqx/modules/bl/massage/entity/MassagePackage.java
@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @description massage_package
@@ -202,5 +203,8 @@ public class MassagePackage implements Serializable {
     @TableField(exist = false)
     private Integer limit;
 
+    @TableField(exist = false)
+    List<MassagePackageDetail> massagePackageDetailList;
+
     public MassagePackage() {}
 }
diff --git a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
index ed24626..6899a3a 100644
--- a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
@@ -1,5 +1,7 @@
 package com.sqx.modules.bl.massage.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.DateUtils;
@@ -7,6 +9,8 @@ import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
+import com.sqx.modules.artificer.entity.Artificer;
+import com.sqx.modules.artificer.entity.ArtificerTime;
 import com.sqx.modules.bl.collect.entity.CollectMassage;
 import com.sqx.modules.bl.collect.service.CollectMassageService;
 import com.sqx.modules.bl.massage.dao.MassagePackageDao;
@@ -42,7 +46,13 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
     @Override
     public Result findPage(MassagePackage massagePackage){
         Page<MassagePackage> pages=new Page<>(massagePackage.getPage(),massagePackage.getLimit());
-        return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,massagePackage)));
+        IPage iPage = baseMapper.findPage(pages,massagePackage);
+        List<MassagePackage> records = iPage.getRecords();
+        for(MassagePackage record:records){
+            List<MassagePackageDetail> massagePackageDetailList = massagePackageDetailDao.selectList(new QueryWrapper<MassagePackageDetail>().eq("main_id", massagePackage.getId()));
+            record.setMassagePackageDetailList(massagePackageDetailList);
+        }
+        return Result.success().put("data",new PageUtils(iPage));
     }
 
     @Override
diff --git a/src/main/java/com/sqx/modules/trip/controller/TripController.java b/src/main/java/com/sqx/modules/trip/controller/TripController.java
index 6823f89..03f2875 100644
--- a/src/main/java/com/sqx/modules/trip/controller/TripController.java
+++ b/src/main/java/com/sqx/modules/trip/controller/TripController.java
@@ -42,6 +42,12 @@ public class TripController {
         return Result.success().put("data",new PageUtils(tripService.page(new Page<>(page,limit),new QueryWrapper<Trip>().like(StringUtils.isNotBlank(city),"city",city))));
     }
 
+    @GetMapping("/selectCityList")
+    @ApiOperation("查询开放城市列表")
+    public Result selectTripList(){
+        return Result.success().put("data",tripService.list(new QueryWrapper<Trip>()));
+    }
+
     @PostMapping("/insertTrip")
     @ApiOperation("添加出行方式")
     public Result insertTrip(@RequestBody Trip trip){