Merge remote-tracking branch 'origin/jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

This commit is contained in:
HaoWang 2023-09-21 15:59:37 +08:00
commit 8f439825e8
3 changed files with 72 additions and 0 deletions

View File

@ -61,4 +61,31 @@ public class NearbyNursingStationController extends BaseController {
public AjaxResult list(Long nurseStationId, String homeLongitude, String homeLatitude) {
return nearbyNursingStationService.selectNursingStationIntroductionList(nurseStationId, homeLongitude, homeLatitude);
}
/**
* 查询附近某个护理站的服务信息列表
*
* @param nurseStationId 护理站id
* @param nurseClassifyInfoId 护理项目所属分类id
* @return com.xinyilu.nurseapplet.domain.nearbynursingstation.NearbyNursingStationVO
*/
@MobileRequestAuthorization
@GetMapping("/itemList")
public TableDataInfo itemList(Long nurseStationId, Long nurseClassifyInfoId) {
startPage();
return getDataTable(nearbyNursingStationService.selectNursingStationItemList(nurseStationId, nurseClassifyInfoId));
}
/**
* 查询附近某个护理站的产品信息列表
*
* @param nurseStationId 护理站id
* @return com.xinyilu.nurseapplet.domain.nearbynursingstation.NearbyNursingStationVO
*/
@MobileRequestAuthorization
@GetMapping("/productInformation")
public TableDataInfo productList(Long nurseStationId) {
startPage();
return getDataTable(nearbyNursingStationService.selectNursingStationProductList(nurseStationId));
}
}

View File

@ -1,10 +1,13 @@
package com.xinelu.applet.service.nearbynursingstation;
import com.xinelu.applet.dto.nursestation.NurseStationAppletDTO;
import com.xinelu.applet.vo.goodinfo.GoodInfoAndItemVO;
import com.xinelu.applet.vo.nurseclassifyinfo.NurseClassifyInfoVO;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import java.util.List;
/**
* @author ljh
* @version 1.0
@ -38,4 +41,21 @@ public interface INearbyNursingStationService {
* @return com.xinyilu.common.core.domain.AjaxResult
*/
AjaxResult selectNursingStationIntroductionList(Long nurseStationId, String homeLongitude, String homeLatitude);
/**
* 获取附近某个护理站产品信息对象
*
* @param nurseStationId 护理站id
* @param nurseClassifyInfoId 护理项目所属分类id
* @return GoodInfoAndItemVO
**/
List<GoodInfoAndItemVO> selectNursingStationItemList(Long nurseStationId, Long nurseClassifyInfoId);
/**
* 获取附近某个护理站产品信息对象
*
* @param nurseStationId 护理站id
* @return GoodInfoAndItemVO
**/
List<GoodInfoAndItemVO> selectNursingStationProductList(Long nurseStationId);
}

View File

@ -3,6 +3,7 @@ package com.xinelu.applet.service.nearbynursingstation.impl;
import com.xinelu.applet.dto.nursestation.NurseStationAppletDTO;
import com.xinelu.applet.mapper.nearbynursingstation.NearbyNursingStationMapper;
import com.xinelu.applet.service.nearbynursingstation.INearbyNursingStationService;
import com.xinelu.applet.vo.goodinfo.GoodInfoAndItemVO;
import com.xinelu.applet.vo.nearbynursingstation.NearbyNursingStationVO;
import com.xinelu.applet.vo.nearbynursingstation.NursingStationAndClassifyVO;
import com.xinelu.applet.vo.nearbynursingstation.PoserInfoHomeVO;
@ -12,6 +13,7 @@ import com.xinelu.applet.vo.specialdisease.StationClassifyInfoVO;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.enums.NurseClassifyInfoEnum;
import com.xinelu.common.enums.NurseStationItemShelfStatusEnum;
import com.xinelu.common.enums.PoserModuleTypeEnum;
import com.xinelu.common.utils.PageServiceUtil;
import com.xinelu.manage.domain.nurseclassifyinfo.NurseClassifyInfo;
@ -189,6 +191,29 @@ public class NearbyNursingStationServiceImpl implements INearbyNursingStationSer
return AjaxResult.success(nearbyNursingStationVO);
}
/**
* 获取附近护理站服务信息对象
*
* @param nurseStationId 护理站id
* @param nurseClassifyInfoId 护理项目所属分类id
* @return GoodInfoAndItemVO
*/
@Override
public List<GoodInfoAndItemVO> selectNursingStationItemList(Long nurseStationId, Long nurseClassifyInfoId) {
return nearbyNursingStationMapper.getNurseStationItemList(nurseStationId, nurseClassifyInfoId, NurseStationItemShelfStatusEnum.SHELF.getInfo());
}
/**
* 获取附近护理站产品信息对象
*
* @param nurseStationId 护理站id
* @return GoodInfoVO
*/
@Override
public List<GoodInfoAndItemVO> selectNursingStationProductList(Long nurseStationId) {
return nearbyNursingStationMapper.getNurseGoodsList(nurseStationId);
}
/**
* 通过经纬度获取距离(单位)
*