From 128a2e76e32c18b28906da2f8775e4a20584c5e2 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 18 Aug 2023 09:27:22 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=85=85=E7=94=B5=E7=AB=99=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/api/uniapp/OccupyOrderController.java | 7 +++++++ .../java/com/jsowell/api/uniapp/PileController.java | 6 +++--- .../com/jsowell/pile/dto/GenerateOccupyOrderDTO.java | 7 +++++++ .../java/com/jsowell/pile/dto/QueryStationDTO.java | 7 +++++++ .../jsowell/pile/mapper/PileMerchantInfoMapper.java | 7 +++++++ .../pile/service/IPileMerchantInfoService.java | 7 +++++++ .../service/impl/PileMerchantInfoServiceImpl.java | 10 ++++++++++ .../resources/mapper/pile/PileMerchantInfoMapper.xml | 11 +++++++++++ 8 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java new file mode 100644 index 000000000..2f7d58c9f --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java @@ -0,0 +1,7 @@ +package com.jsowell.api.uniapp;/** + * TODO + * + * @Date 2023/8/18 8:55 + * @author Lemon + */public class OccupyOrderController { +} diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 6eb1c6c2f..d8a72ffe7 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -59,9 +59,9 @@ public class PileController extends BaseController { // 获取appid（第三方平台用） String appId = request.getHeader("appId"); if (StringUtils.isNotBlank(appId)) { - // 获取merchantId - String merchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId); - queryStationDTO.setMerchantId(merchantId); + // 获取deptIds + List deptIds = pileMerchantInfoService.getDeptIdsByAppId(appId); + queryStationDTO.setMerchantDeptIds(deptIds); } PageResponse pageResponse = pileStationInfoService.uniAppQueryStationInfoList(queryStationDTO); response = new RestApiResponse<>(pageResponse); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java new file mode 100644 index 000000000..e3586a308 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java @@ -0,0 +1,7 @@ +package com.jsowell.pile.dto;/** + * TODO + * + * @Date 2023/8/18 9:00 + * @author Lemon + */public class GenerateOccupyOrderDTO { +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java index 7396e9ca9..66f10db61 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java @@ -6,6 +6,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * 站点管理前台参数 * @@ -73,4 +75,9 @@ public class QueryStationDTO extends BaseEntity { * 站点二维码前缀 */ private String qrcodePrefix; + + /** + * 运营商部门id + */ + private List merchantDeptId; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java index cd071fa68..a8235d91a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java @@ -96,4 +96,11 @@ public interface PileMerchantInfoMapper { * @return */ String getFirstLevelMerchantIdByAppId(String appId); + + /** + * 通过appid查询运营商部门id + * @param appId + * @return + */ + List getDeptIdsByAppId(@Param("appId") String appId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java index 365f1f8be..3c311c1d1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java @@ -98,4 +98,11 @@ public interface IPileMerchantInfoService { List queryFirstLevelMerchant(); String queryAppIdByMerchantId(String merchantId); + + /** + * 通过appid获取运营商部门id + * @param appId + * @return + */ + List getDeptIdsByAppId(String appId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 2a057d639..0e621a1a8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -378,5 +378,15 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { return appId; } + /** + * 通过appid查询运营商部门id + * @param appId + * @return + */ + @Override + public List getDeptIdsByAppId(String appId) { + return pileMerchantInfoMapper.getDeptIdsByAppId(appId); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index 652bd7788..c3daf91f5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -343,4 +343,15 @@ and merchant_level = '1' and app_id = #{appId,jdbcType=VARCHAR} + + \ No newline at end of file