diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java new file mode 100644 index 0000000..35a1960 --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/controller/nursingorder/NursingOrderController.java @@ -0,0 +1,96 @@ +package com.xinelu.applet.controller.nursingorder; + +import com.xinelu.applet.service.nursingorder.INursingOrderService; +import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; +import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; +import com.xinelu.common.annotation.MobileRequestAuthorization; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.OrderTypeEnum; +import com.xinelu.manage.domain.goodsOrder.GoodsOrder; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Objects; + +/** + * @Description 个人中心订单页面 + * @Author zhangheng + * @Date 2022-09-06 + * @Version 1.0 + */ +@RestController +@RequestMapping("/nurseApplet/nursingOrder") +public class NursingOrderController extends BaseController { + + @Resource + private INursingOrderService nursingOrderService; + + /** + * 根据登录id查询订单列表 + */ + @GetMapping("/userPage") + public TableDataInfo page(Long parentId) { + startPage(); + List nursingOrderByPatientId = nursingOrderService.getNursingOrderByPatientId(parentId); + return getDataTable(nursingOrderByPatientId); + } + + /** + * 根据护理人id以及订单状态查询订单信息 + */ + @MobileRequestAuthorization + @GetMapping("/goodsOrder") + public TableDataInfo goodsOrder(AppletGoodsOrderVO goodsOrderVO) { + startPage(); + List goodsOrder = nursingOrderService.getGoodsOrder(goodsOrderVO); + return getDataTable(goodsOrder); + } + + /** + * 查询退款原因 + */ + @MobileRequestAuthorization + @GetMapping("/refundReason") + public TableDataInfo refundReason(SysDictData sysDictData) { + startPage(); + List refundReason = nursingOrderService.getRefundReason(sysDictData); + return getDataTable(refundReason); + } + + /** + * 修改商品订单(退款售后记录信息) + */ + @MobileRequestAuthorization + @PostMapping("/edit") + public AjaxResult edit(@RequestBody GoodsOrder goodsOrder) { + if (Objects.isNull(goodsOrder.getId())) { + return AjaxResult.error("订单id不能为空！"); + } + if (StringUtils.isNotBlank(goodsOrder.getOrderType()) && !OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType())) { + if (Objects.isNull(goodsOrder.getRefundReasonDictId())) { + return AjaxResult.error("请选择退款原因！"); + } + } + return toAjax(nursingOrderService.updateGoodsOrder(goodsOrder)); + } + + /** + * 根据预约订单编号查询对应得订单详情信息 + * + * @param orderNo 订单编号 + * @return 详情信息 + */ + @MobileRequestAuthorization + @GetMapping("/getAppointmentDetailsInfo") + public AjaxResult getAppointmentDetailsInfo(String orderNo) { + if (StringUtils.isBlank(orderNo)) { + return AjaxResult.error("请选择要查询的预约订单信息！"); + } + return nursingOrderService.getAppointmentDetailsInfo(orderNo); + } +} \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nursingorder/NursingOrderMapper.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nursingorder/NursingOrderMapper.java new file mode 100644 index 0000000..bd37450 --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/mapper/nursingorder/NursingOrderMapper.java @@ -0,0 +1,66 @@ +package com.xinelu.applet.mapper.nursingorder; + + +import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; +import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; +import com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO; +import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.manage.domain.goodsOrder.GoodsOrder; + +import java.util.List; + +/** + * 功能描述: 护理站订单信息 + * + * @author zhangheng + */ +public interface NursingOrderMapper { + + /** + * 根据被护理人patientId查询订单信息 + * + * @param patientId 会员id + * @return 订单列表 + */ + List getNursingOrderVOByPatientId(Long patientId); + + /** + * 根据护理人id以及订单状态查询订单信息 + * + * @param goodsOrderVO 订单信息 + * @return AppletGoodsOrderVO + **/ + List getGoodsOrder(AppletGoodsOrderVO goodsOrderVO); + + /** + * 查询退款原因 + * + * @param sysDictData 退款原因 + * @return com.xinyilu.common.core.domain.entity.SysDictData + **/ + List getRefundReason(SysDictData sysDictData); + + /** + * 修改商品订单(退款售后记录信息) + * + * @param goodsOrder 商品订单 + * @return 结果 + */ + int updateGoodsOrder(GoodsOrder goodsOrder); + + /** + * 根据预约订单编号查询对应得详情信息 + * + * @param orderNo 订单编号 + * @return 详情信息 + */ + AppointmentOrderDetailsInfoVO getAppointmentOrderDetailsInfo(String orderNo); + + /** + * 查询护理站信息 + * + * @param nurseStationItemId 护理站项目id + * @return 护理站信息 + */ + AppointmentOrderDetailsInfoVO getNurseStationByItemId(Long nurseStationItemId); +} \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java new file mode 100644 index 0000000..1ea42de --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/INursingOrderService.java @@ -0,0 +1,58 @@ +package com.xinelu.applet.service.nursingorder; + + +import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; +import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.manage.domain.goodsOrder.GoodsOrder; + +import java.util.List; + +/** + * 订单列表Service接口 + * + * @author zhangheng + * @date 2022-09-06 + */ +public interface INursingOrderService { + /** + * 根据被护理人patientId查询订单信息 + * + * @param patientId 被护理人id + * @return 订单列表 + */ + List getNursingOrderByPatientId(Long patientId); + + /** + * 根据护理人id以及订单状态查询订单信息 + * + * @param goodsOrderVO 订单信息 + * @return java.util.List + **/ + List getGoodsOrder(AppletGoodsOrderVO goodsOrderVO); + + /** + * 查询退款原因 + * + * @param sysDictData 退款原因 + * @return com.xinyilu.common.core.domain.entity.SysDictData + **/ + List getRefundReason(SysDictData sysDictData); + + /** + * 修改商品订单(退款售后记录信息) + * + * @param goodsOrder 商品订单 + * @return 结果 + */ + int updateGoodsOrder(GoodsOrder goodsOrder); + + /** + * 根据预约订单编号查询对应得订单详情信息 + * + * @param orderNo 订单编号 + * @return 详情信息 + */ + AjaxResult getAppointmentDetailsInfo(String orderNo); +} \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java new file mode 100644 index 0000000..6756490 --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nursingorder/impl/NursingOrderServiceImpl.java @@ -0,0 +1,110 @@ +package com.xinelu.applet.service.nursingorder.impl; + + +import com.xinelu.applet.mapper.nursingorder.NursingOrderMapper; +import com.xinelu.applet.service.nursingorder.INursingOrderService; +import com.xinelu.applet.vo.nursingorder.AppletGoodsOrderVO; +import com.xinelu.applet.vo.nursingorder.NursingOrderInfoVO; +import com.xinelu.applet.vo.specialdisease.AppointmentOrderDetailsInfoVO; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.entity.SysDictData; +import com.xinelu.common.enums.ConfirmRefundStatusEnum; +import com.xinelu.common.enums.GooodsOrderStatusEnum; +import com.xinelu.manage.domain.goodsOrder.GoodsOrder; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; + +/** + * @Description 订单分页 + * @Author ZhangHeng + * @Date 2022-09-06 + * @Version + */ +@Service +public class NursingOrderServiceImpl implements INursingOrderService { + + @Resource + private NursingOrderMapper nursingOrderMapper; + + /** + * 查询个人订单列表并分页 + * + * @param patientId 被护理人id + * @return 结果 + */ + @Override + public List getNursingOrderByPatientId(Long patientId) { + return nursingOrderMapper.getNursingOrderVOByPatientId(patientId); + } + + /** + * 根据护理人id以及订单状态查询订单信息 + * + * @param goodsOrderVO 订单信息 + * @return java.util.List + **/ + @Override + public List getGoodsOrder(AppletGoodsOrderVO goodsOrderVO) { + return nursingOrderMapper.getGoodsOrder(goodsOrderVO); + } + + /** + * 查询退款原因 + * + * @param sysDictData 退款原因 + * @return com.xinyilu.common.core.domain.entity.SysDictData + **/ + @Override + public List getRefundReason(SysDictData sysDictData) { + //dict_type 字典类型refund_reason + sysDictData.setDictType("refund_reason"); + return nursingOrderMapper.getRefundReason(sysDictData); + } + + /** + * 修改商品订单(退款售后记录信息) + * + * @param goodsOrder 商品订单 + * @return 结果 + */ + @Override + public int updateGoodsOrder(GoodsOrder goodsOrder) { + //设置修改人以及修改时间 + goodsOrder.setUpdateTime(LocalDateTime.now()); + //订单状态 退款中 WAIT_REFUND + goodsOrder.setOrderStatus(GooodsOrderStatusEnum.WAIT_REFUND.getInfo()); + //确认退款状态 未确认 NOT_CONFIRM + goodsOrder.setConfirmRefundStatus(ConfirmRefundStatusEnum.NOT_CONFIRM.getInfo()); + return nursingOrderMapper.updateGoodsOrder(goodsOrder); + } + + /** + * 根据预约订单编号查询对应得订单详情信息 + * + * @param orderNo 订单编号 + * @return 详情信息 + */ + @Override + public AjaxResult getAppointmentDetailsInfo(String orderNo) { + //查询预约服务订单信息 + AppointmentOrderDetailsInfoVO detailsInfoVO = nursingOrderMapper.getAppointmentOrderDetailsInfo(orderNo); + if (Objects.isNull(detailsInfoVO)) { + return AjaxResult.success(); + } + //查询护理站相关信息 + AppointmentOrderDetailsInfoVO nurseStationInfo = nursingOrderMapper.getNurseStationByItemId(Objects.isNull(detailsInfoVO.getNurseStationItemId()) ? 0L : detailsInfoVO.getNurseStationItemId()); + if (Objects.nonNull(nurseStationInfo)) { + detailsInfoVO.setNurseStationName(StringUtils.isBlank(nurseStationInfo.getNurseStationName()) ? "" : nurseStationInfo.getNurseStationName()); + detailsInfoVO.setStationPhone(StringUtils.isBlank(nurseStationInfo.getStationPhone()) ? "" : nurseStationInfo.getStationPhone()); + detailsInfoVO.setAddress(StringUtils.isBlank(nurseStationInfo.getAddress()) ? "" : nurseStationInfo.getAddress()); + detailsInfoVO.setStationPictureUrl(StringUtils.isBlank(nurseStationInfo.getStationPictureUrl()) ? "" : nurseStationInfo.getStationPictureUrl()); + detailsInfoVO.setItemPictureUrl(StringUtils.isBlank(nurseStationInfo.getItemPictureUrl()) ? "" : nurseStationInfo.getItemPictureUrl()); + } + return AjaxResult.success(detailsInfoVO); + } +} \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java new file mode 100644 index 0000000..12b5735 --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/AppletGoodsOrderVO.java @@ -0,0 +1,249 @@ +package com.xinelu.applet.vo.nursingorder; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + + +/** + * @author ljh + * @version 1.0 + * Create by 2022/10/25 15:49 + */ +@Data +public class AppletGoodsOrderVO implements Serializable { + private static final long serialVersionUID = -1046127024688630443L; + + /** + * 商品订单表id + */ + private Long goodsOrderId; + + /** + * 护理站id + */ + private Long nurseStationId; + + /** + * 会员id + */ + private Long patientId; + + /** + * 订单编号 + */ + private String goOrderNo; + /** + * 订单编号 + */ + private String godOrderNo; + + /** + * 订单状态，待付款：WAIT_PAY，已付款：PAY，已取消：CANCEL，待收货：WAIT_RECEIVED，已收货：RECEIVED，待退款：WAIT_REFUND，已退款：REFUNDED，待退货：WAIT_RETURNED，已退货：RETURNED + */ + private String orderStatus; + + /** + * 订单总金额 + */ + private BigDecimal totalPrice; + /** + * 收货人 + */ + private String receiver; + /** + * 收货地址 + */ + private String receiveAddress; + /** + * 联系电话 + */ + private String phone; + + /** + * 订单总金额 + */ + private BigDecimal godTotalPrice; + + /** + * 下单时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime orderTime; + + /** + * 主键id + */ + private Long goodsOrderDetailsId; + + + /** + * 商品名称 + */ + private String goodsName; + + /** + * 商品数量 + */ + private Integer goodsCount; + + /** + * 商品属性名称 + */ + private String goodsAttributeName; + + /** + * 商品属性内容 + */ + private String goodsAttributeContent; + + /** + * 商品单价（元） + */ + private BigDecimal goodsPrice; + + + /** + * 优惠金额（元） + */ + private BigDecimal discountPrice; + + /** + * 运费金额（元） + */ + private BigDecimal transportPrice; + + /** + * 赠送积分 + */ + private Integer giveIntegral; + + + /** + * 退款退货类型：REFUND_MONEY_GOODS，仅退款：ONLY_REFUND_MONEY + */ + private String refundType; + + /** + * 退款原因类型字典表id + */ + private Long refundReasonDictId; + + /** + * 退货原因具体描述 + */ + private String refundReasonRemark; + + /** + * 确认退款状态，未确认：NOT_CONFIRM，已确认：CONFIRMED + */ + private String confirmRefundStatus; + + /** + * 商品属性图片地址 + */ + private String attributePitureUrl; + + /** + * 退款时间时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + + /** + * 字典标签 + */ + private String dictLabel; + + /** + * 快递单号 + */ + private String expressNo; + + /** + * 购买来源 + */ + private String buySource; + + /** + * 订单类型，积分兑换：INTEGRAL_EXCHANGE，直接购买：DIRECT_BUY，健康咨询：HEALTH_CONSULTATION + */ + private String orderType; + + + /** + * 积分抵扣数量 + */ + private Integer integralDeductionCount; + + /** + * 退款详情-申请时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime appleTime; + + /** + * 积分兑换标识，0：否，1：是 + */ + private Integer integralExchangeFlag; + + /** + * 积分兑换门槛值 + */ + private Integer integralExchangeSill; + + /** + * 积分兑换商品数量 + */ + private Integer integralExchangeCount; + + /** + * 订单原始总金额（优惠券之前的价格，即：商品数量*商品单价） + */ + private BigDecimal originalTotalPrice; + + /** + * 优惠券名称 + */ + private String couponTitle; + + /** + * 优惠券id + */ + private Long couponId; + + /** + * 健康咨询人员表id，记录咨询订单中选择的医生 + */ + private Long hospitalPersonId; + + /** + * 下单方式，手机App：MOBILE_APP，微信小程序：WECHAT_APPLET，支付宝小程序：ALI_PAY_APPLET + */ + private String orderChannel; + + /** + * 健康咨询内容，健康咨询类型的订单使用 + */ + private String healthConsultationContent; + + /** + * 健康咨询预约时间，健康咨询订单使用 + **/ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date healthAppointDate; + + /** + * 健康咨询专家名称，健康咨询类型的订单使用 + */ + private String hospitalPersonName; + + /** + * 科室人员头像地址 + */ + private String personPictureUrl; +} diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/NursingOrderInfoVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/NursingOrderInfoVO.java new file mode 100644 index 0000000..065ed8a --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/NursingOrderInfoVO.java @@ -0,0 +1,103 @@ +package com.xinelu.applet.vo.nursingorder; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.core.domain.BaseDomain; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalTime; + +/** + * 个人中心订单Controller + * + * @author zhangheng + * @date 2022-09-06 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class NursingOrderInfoVO extends BaseDomain implements Serializable { + + private static final long serialVersionUID = -2337545308977415936L; + + /** + * 预约订单编号 + */ + private String orderNo; + /** + * 订单数量 + */ + private Long orderCount; + + /** + * 服务日期，格式：yyyy-MM-dd + */ + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate serviceDate; + + /** + * 服务开始时间，格式：HH:mm + */ + + @JsonFormat(pattern = "HH:mm:ss") + private LocalTime serviceStartTime; + + /** + * 服务结束时间，格式：HH:mm + */ + @JsonFormat(pattern = "HH:mm:ss") + private LocalTime serviceEndTime; + + /** + * 预约订单状态，代付款：WAIT_PAY，待派单：WAIT_DISPATCH，未完成：NOT_FINISH，服务完成：COMPLETE + */ + private String orderStatus; + + /** + * 预约状态，0：可以预约，1：不可以预约 + */ + private Integer appointmentStatus; + + /** + * 预约总价格，单位：元 + */ + private BigDecimal totalPrice; + + /** + * 护理项目名称 + */ + private String nurseItemName; + + /** + * 护理项目价格 + */ + private BigDecimal nurseItemPrice; + + + /** + * 是否删除标识，0：否，1：是 + */ + private Integer delFlag; + + /** + * 提前预约时长，单位小时 + */ + private Integer advanceAppointDuration; + + /** + * 护理站图片路径 + */ + private String itemPictureUrl; + + /** + * 护理站图片路径 + */ + private String nurseStationName; + + /** + * 服务时长和单位 + */ + private String itemServeDurationUnit; +} \ No newline at end of file diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/specialdisease/AppointmentOrderDetailsInfoVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/specialdisease/AppointmentOrderDetailsInfoVO.java new file mode 100644 index 0000000..219c62b --- /dev/null +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/specialdisease/AppointmentOrderDetailsInfoVO.java @@ -0,0 +1,208 @@ +package com.xinelu.applet.vo.specialdisease; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.manage.domain.appointmentorderconsumable.AppointmentOrderConsumable; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; + +/** + * @Description 预约服务订单详情返回值实体类 + * @Author 纪寒 + * @Date 2022-11-11 14:48:01 + * @Version 1.0 + */ +@Data +public class AppointmentOrderDetailsInfoVO implements Serializable { + private static final long serialVersionUID = 7042842920314984169L; + + /** + * 订单主表id + */ + private Long appointmentOrderId; + + /** + * 会员id + */ + private Long patientId; + + /** + * 护理项目id + */ + private Long nurseStationItemId; + + /** + * 护理站名称 + */ + private String nurseStationName; + + /** + * 护理站头像 + */ + private String stationPictureUrl; + + /** + * 护理站地址 + */ + private String address; + + /** + * 护理站联系电话 + */ + private String stationPhone; + + /** + * 护理人联系电话 + */ + private String patientPhone; + + /** + * 服务项目名称 + */ + private String nurseItemName; + + /** + * 服务时长 + */ + private String itemServeDurationUnit; + + /** + * 护理人名称即：会员名称 + */ + private String patientName; + + /** + * 服务地址 + */ + private String serviceAddress; + + /** + * 服务时间 + */ + private LocalDate serviceDate; + + /** + * 服务开始时间 + */ + private LocalTime serviceStartTime; + + /** + * 服务结束时间 + */ + private LocalTime serviceEndTime; + + /** + * 订单编号 + */ + private String orderNo; + + /** + * 备注信息 + */ + private String remark; + + /** + * 服务项目价格 + */ + private BigDecimal nurseItemPrice; + + /** + * 耗材总价格 + */ + private BigDecimal consumableTotalPrice; + + /** + * 订单总价格 + */ + private String totalPrice; + + /** + * 订单状态 + */ + private String orderStatus; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + + /** + * 服务项目图片 + */ + private String itemPictureUrl; + /** + * 预约订单耗材信息 + */ + private List itemConsumableList; + + /** + * 失能情况，NOT_DISABLED：未失能，DISABLED：已失能 + */ + private String disablingCondition; + + /** + * 失能原因 + */ + private String disablingReason; + + /** + * 订单类型，院内陪护：COMPANION_IN_HOSPITAL，其它：OTHER + */ + private String orderType; + + /** + * 陪护开始时间，院内陪护订单使用，格式：yyyy-MM-dd + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate companionStartDate; + + /** + * 陪护结束时间，院内陪护订单使用，格式：yyyy-MM-dd + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate companionEndDate; + + /** + * 陪护天数，院内陪护订单使用 + */ + private Integer companionDays; + + /** + * 订单填写人姓名，院内陪护订单使用 + */ + private String orderWriteName; + + /** + * 护理人姓名，院内陪护订单使用 + */ + private String caregiverName; + + /** + * 护理人电话，院内陪护订单使用 + */ + private String caregiverPhone; + + /** + * 医院名称，院内陪护订单使用 + */ + private String hospitalName; + + /** + * 科室名称，院内陪护订单使用 + */ + private String departmentName; + + /** + * 病床号，院内陪护订单使用 + */ + private String hospitalBedNumber; +} diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml new file mode 100644 index 0000000..b5b9772 --- /dev/null +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update goods_order + + + nurse_station_id = + #{nurseStationId}, + + + patient_id = + #{patientId}, + + + order_no = + #{orderNo}, + + + order_status = + #{orderStatus}, + + + total_price = + #{totalPrice}, + + + receiver = + #{receiver}, + + + receive_address = + #{receiveAddress}, + + + phone = + #{phone}, + + + order_time = + #{orderTime}, + + + order_channel = + #{orderChannel}, + + + buy_source = + #{buySource}, + + + remark = + #{remark}, + + + del_flag = + #{delFlag}, + + + create_by = + #{createBy}, + + + create_time = + #{createTime}, + + + update_by = + #{updateBy}, + + + update_time = + #{updateTime}, + + + refund_type = + #{refundType}, + + + refund_reason_dict_id = + #{refundReasonDictId}, + + + refund_reason_remark = + #{refundReasonRemark}, + + + confirm_refund_status = + #{confirmRefundStatus}, + + + where id = #{id} + + + + + + \ No newline at end of file