From 1729b8d43a6c89e6998d0a7554873068ee9fe18d Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 25 Sep 2025 15:37:07 +0800 Subject: [PATCH] Changes --- .../src/main/resources/application-druid-root.yml | 10 +++++--- .../contoller/ApiMallUserTeacherController.java | 30 ++++++++++++++++++++++ .../applet/service/impl/IMallOrderServiceImpl.java | 5 ++-- .../model/service/impl/AppUsersServiceImpl.java | 13 +++++++++- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml index f12d73a..1b97133 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true master: - url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true -# url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true +# url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true + url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true username: root password: Qweruiop@123 # 从库数据源 @@ -57,7 +57,8 @@ wechat: secret: 你的微信服务号密钥 merchantId: 1665639691 # privateKeyPath: /data/software/app/key/apiclient_key.pem - privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem + + privateKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem # privateKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem # privateKeyPath: /root/pem/apiclient_key.pem # privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem @@ -134,7 +135,8 @@ wechat-admin: staffAppId: wx01f0f43759922fda staffSecret: b0a5617e6e4c387262a32af2b355c8b6 # publicKeyPath: /root/pem/pub_key.pem - publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem + publicKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem +# publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: /data/software/app/key/pub_key.pem publicKeyId: PUB_KEY_ID_0116656396912025062400291558001601 diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java index 029a724..d3b26db 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java @@ -7,6 +7,7 @@ import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.mapper.MemberMapper; import com.cyl.manager.ums.service.MemberWechatService; import com.ruoyi.applet.mallpojo.TeacherListRequest; +import com.ruoyi.applet.pojo.dto.filterQualifiedUsersVo; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -74,7 +75,34 @@ public class ApiMallUserTeacherController extends BaseController { } + @ApiOperation("mall端-查询周边伴宠师列表集合接口") + @GetMapping("/v2/getTeacherList") + public TableDataInfo getTeacherList2(TeacherListRequest request) { + startPage(); + + List appUsers2 = new ArrayList<>(); + + if (StringUtils.isNotEmpty(request.getLatitude())){ + appUsers2 = appUsersService.filterQualifiedUsers( + filterQualifiedUsersVo.builder() + .companionLevel(request.getTeacherLevels()) + .latitude(Double.parseDouble(request.getLatitude())) + .longitude(Double.parseDouble(request.getLongitude())) + .build() + ); + } + + if (appUsers2.isEmpty()){ + appUsers2.add(appUsersService.lambdaQuery().last("limit 1").one()); + } + for (AppUsers users : appUsers2) { + users.setEvaluationNum(omsOrderEvaluationService.lambdaQuery() + .eq(OmsOrderEvaluation::getTechnicianId, users.getUserHh()).count()); + } + + return getDataTable(appUsers2); + } //mall端-查询周边伴宠师集合 @@ -82,6 +110,8 @@ public class ApiMallUserTeacherController extends BaseController { @GetMapping("/getTeacherList") public TableDataInfo getTeacherList(TeacherListRequest request) { startPage(); + + AppUsers appUsers = new AppUsers(); appUsers.setUserBcs(1); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java index d5ad161..5c6e9a6 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IMallOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.ruoyi.applet.service.IMallOrderService; import com.ruoyi.common.config.properties.SmsProperties; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.sms.AliyunSmsUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.model.domain.*; import com.ruoyi.model.service.*; import lombok.Data; @@ -106,7 +107,7 @@ public class IMallOrderServiceImpl implements IMallOrderService { appletOrder.setOrderId(h5OrderVO.getOrderId()); appletOrder.setCompanionLevel(h5OrderVO.getCompanionLevel()); - if (h5OrderVO.getLongitude() != null && h5OrderVO.getLatitude() != null){ + if (StringUtils.isNotEmpty(h5OrderVO.getLongitude()) && StringUtils.isNotEmpty(h5OrderVO.getLatitude())){ appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude())); appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude())); } @@ -185,7 +186,7 @@ public class IMallOrderServiceImpl implements IMallOrderService { appletOrder.setOrderId(h5OrderVO.getOrderId()); appletOrder.setCompanionLevel(h5OrderVO.getCompanionLevel()); - if (h5OrderVO.getLongitude() != null && h5OrderVO.getLatitude() != null){ + if (StringUtils.isNotEmpty(h5OrderVO.getLongitude()) && StringUtils.isNotEmpty(h5OrderVO.getLatitude())){ appletOrder.setLongitude(Double.valueOf(h5OrderVO.getLongitude())); appletOrder.setLatitude(Double.valueOf(h5OrderVO.getLatitude())); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java index 7917665..ee6794f 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java @@ -139,6 +139,8 @@ public class AppUsersServiceImpl extends ServiceImpl i ArrayList notAddressIds = new ArrayList<>(); + List addressList = new ArrayList<>(); + LambdaQueryChainWrapper addressQW = appletAddressService.lambdaQuery(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -189,7 +191,7 @@ public class AppUsersServiceImpl extends ServiceImpl i BigDecimal lngMax = orderLng.add(lngRange); // 查询所有有效的地址，并且在15公里范围内 - List addressList = appletAddressService.lambdaQuery() + addressList = appletAddressService.lambdaQuery() .eq(AppletAddress::getStatus, "true") .notIn(!notAddressIds.isEmpty(), AppletAddress::getId, notAddressIds) .ge(AppletAddress::getLatitude, latMin.toString()) @@ -230,6 +232,7 @@ public class AppUsersServiceImpl extends ServiceImpl i qualifiedTechnicians = appUsersMapper.selectList( Wrappers.lambdaQuery() .eq(ObjectUtils.isNotEmpty(filterVo.getCompanionLevel()),AppUsers::getUserBcsRole, filterVo.getCompanionLevel()) + .eq(AppUsers::getUserBcs, 1) // .and(ObjectUtils.isNotEmpty(filterVo.getCompanionLevel()), n -> { // n.eq(AppUsers::getUserBcsRole, filterVo.getCompanionLevel()) // .or() @@ -239,6 +242,14 @@ public class AppUsersServiceImpl extends ServiceImpl i ); } + for (AppUsers users : qualifiedTechnicians) { + + List address = addressList.stream().filter(n -> n.getUserId().equals(users.getUserId())) + .collect(Collectors.toList()); + + users.setAppletAddresseList(address); + } + return qualifiedTechnicians; }