Commit b419ba69 by sdif

用户端代码提交

parent 603559f1
...@@ -41,7 +41,6 @@ public class AppletCompanyController extends BaseController { ...@@ -41,7 +41,6 @@ public class AppletCompanyController extends BaseController {
/** /**
* 查询商户列表 * 查询商户列表
*/ */
@SaCheckPermission("merchant:company:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<CompanyVo> list(CompanyBo bo, PageQuery pageQuery) { public TableDataInfo<CompanyVo> list(CompanyBo bo, PageQuery pageQuery) {
return iCompanyService.queryPageList(bo, pageQuery); return iCompanyService.queryPageList(bo, pageQuery);
......
package com.pz.applet;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.pz.common.annotation.Log;
import com.pz.common.annotation.RepeatSubmit;
import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType;
import com.pz.common.utils.poi.ExcelUtil;
import com.pz.system.domain.bo.ServicesBo;
import com.pz.system.domain.vo.ServicesVo;
import com.pz.system.service.IServicesService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/**
* 服务
*
* @author ruoyi
* @date 2023-09-07
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/applet/services")
public class AppletServicesController extends BaseController {
private final IServicesService iServicesService;
/**
* 查询服务列表
*/
@GetMapping("/list")
public TableDataInfo<ServicesVo> list(ServicesBo bo, PageQuery pageQuery) {
return iServicesService.queryPageList(bo, pageQuery);
}
/**
* 获取服务详细信息
*
* @param id 主键
*/
@SaCheckPermission("system:services:query")
@GetMapping("/{id}")
public R<ServicesVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iServicesService.queryById(id));
}
}
...@@ -99,6 +99,7 @@ public class AppletSysUserController extends BaseController { ...@@ -99,6 +99,7 @@ public class AppletSysUserController extends BaseController {
*/ */
@PutMapping @PutMapping
public R<Void> edit(@Validated @RequestBody SysUser user) { public R<Void> edit(@Validated @RequestBody SysUser user) {
user.setUserId(1L);
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId()); userService.checkUserDataScope(user.getUserId());
if (!userService.checkUserNameUnique(user)) { if (!userService.checkUserNameUnique(user)) {
......
package com.pz.applet;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.pz.common.annotation.Log;
import com.pz.common.annotation.RepeatSubmit;
import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType;
import com.pz.common.utils.poi.ExcelUtil;
import com.pz.system.domain.bo.CreateOrderBo;
import com.pz.system.domain.bo.TotalOrderBo;
import com.pz.system.domain.vo.TotalOrderVo;
import com.pz.system.service.ITotalOrderService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
import java.util.List;
/**
* 总订单
*
* @author ruoyi
* @date 2023-09-08
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/applet/totalOrder")
public class AppletTotalOrderController extends BaseController {
private final ITotalOrderService iTotalOrderService;
/**
* 查询总订单列表
*/
@GetMapping("/list")
public TableDataInfo<TotalOrderVo> list(TotalOrderBo bo, PageQuery pageQuery) {
return iTotalOrderService.queryPageList(bo, pageQuery);
}
/**
* 获取总订单详细信息
*
* @param id 主键
*/
@GetMapping("/{id}")
public R<TotalOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(iTotalOrderService.queryById(id));
}
/**
* 新增总订单
*/
@RepeatSubmit()
@PostMapping()
public R<TotalOrderVo> add(@Validated(AddGroup.class) @RequestBody CreateOrderBo bo) {
return R.ok(iTotalOrderService.createOrder(bo));
}
/**
* 修改总订单
*/
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TotalOrderBo bo) {
return toAjax(iTotalOrderService.updateByBo(bo));
}
/**
* 删除总订单
*
* @param ids 主键串
*/
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
return toAjax(iTotalOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
...@@ -46,4 +46,13 @@ public class AppletUserVsitorController extends BaseController { ...@@ -46,4 +46,13 @@ public class AppletUserVsitorController extends BaseController {
bo.setUid(1); bo.setUid(1);
return toAjax(iUserVsitorService.insertByBo(bo)); return toAjax(iUserVsitorService.insertByBo(bo));
} }
/**
* 修改就诊人
*/
@RepeatSubmit()
@PutMapping()
public R<Void> update(@Validated(AddGroup.class) @RequestBody UserVsitorBo bo) {
return toAjax(iUserVsitorService.updateByBo(bo));
}
} }
package com.pz.common.enums;
/**
* 一般陪诊订单状态
*/
public enum CommonOrderStatus {
RELEASE(0,"已发布"),
TAKE_ORDER(1,"已接单"),
DONE(2,"已完成"),
BEING_REFUND(3,"退款中"),
REFUND(4,"已退款"),
UNDERWAY(6,"进行中");
private final Integer code;
private final String info;
CommonOrderStatus(Integer code, String info) {
this.code = code;
this.info = info;
}
public Integer getCode() {
return code;
}
public String getInfo() {
return info;
}
}
package com.pz.common.enums;
/**
* 代办买药
*/
public enum DBMYOrderStatus {
RELEASE(0,"已发布"),
TAKE_ORDER(1,"已接单"),
DONE(2,"已完成"),
BEING_REFUND(3,"退款中"),
REFUND(4,"已退款"),
UNDERWAY(6,"进行中"),
TO_BE_MAILED(7,"待邮寄原件"),
HAVE_BEEN_MAILED(8,"已邮寄原件");
private final Integer code;
private final String info;
DBMYOrderStatus(Integer code, String info) {
this.code = code;
this.info = info;
}
public Integer getCode() {
return code;
}
public String getInfo() {
return info;
}
}
package com.pz.common.enums;
/**
* 商城订单状态
*/
public enum ShopOrderStatus {
WAIT_DELIVER(0,"待发货"),
DELIVER(1,"已发货"),
DONE(2,"已完成"),
BEING_REFUND(3,"退款中"),
REFUND(4,"已退款");
private final Integer code;
private final String info;
ShopOrderStatus(Integer code, String info) {
this.code = code;
this.info = info;
}
public Integer getCode() {
return code;
}
public String getInfo() {
return info;
}
}
package com.pz.common.enums;
/**
* 主订单状态
*/
public enum TotalOrderStatus {
NO_PAYMENT(0,"待支付"),
PAYMENT(1,"已支付"),
DONE(2,"已完成"),
CANCEL(7,"已取消"),
REFUND(8,"已退款");
private final Integer code;
private final String info;
TotalOrderStatus(Integer code, String info) {
this.code = code;
this.info = info;
}
public Integer getCode() {
return code;
}
public String getInfo() {
return info;
}
}
...@@ -37,6 +37,10 @@ public class UserVsitor extends BaseEntity { ...@@ -37,6 +37,10 @@ public class UserVsitor extends BaseEntity {
*/ */
private String idcard; private String idcard;
/** /**
* 手机号
*/
private String phone;
/**
* 是否成年 * 是否成年
*/ */
private Integer isAdult; private Integer isAdult;
......
package com.pz.system.domain.bo;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
public class CreateOrderBo extends BaseEntity {
/**
* 业务id
*/
private Integer businessId;
/**
* 订单价格
*/
private Double payMoney;
/**
* 服务ID
*/
private Integer serviceId;
/**
* 备注
*/
private String remark;
/**
* 医院id
*/
private Integer hospitalId;
/**
* 科室id
*/
private Integer departmentId;
/**
* 就诊人员ID
*/
private Integer visitorId;
/**
*就诊时间
*/
private String visitTime;
/**
* 预约电话
*/
private String phone;
/**
* 主诉
*/
private String chiefComplaint;
/**
* 现病史
*/
private String historyOfPresentIllness;
/**
* 既往史
*/
private String pastHistory;
/**
* 上次就医情况
*/
private String lastMedicalTreatmentSituation;
/**
* 治疗后情况
*/
private String postTreatmentCondition;
/**
* 服务要求
*/
private String serviceRequirements;
/**
* 相关报告(文件数组)
*/
private List<String> relatedReports;
/**
* 开始日期
*/
private String startDay;
/**
* 结束日期
*/
private String endDay;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
/**
* 药品名称
*/
private String ypName;
/**
* 药店地址
*/
private String ydAddress;
/**
* 是否处方药 0-否。1-是
*/
private Integer isCf;
/**
* 处方附件(文件数组)
*/
private List<String> prescriptionAttachment;
/**
* 取药方式:0-邮寄到家,1-送货上门
*/
private Integer way;
/**
*收件人
*/
private String recipient;
/**
* 收货地址
*/
private String address;
/**
* 详细地址
*/
private String addressInfo;
/**
* 是否需要冷藏 0-否。1-是
*/
private Integer isRefrigerate;
/**
* 预约时间
*/
private String timeOfAppointment;
/**
* 医生Id
*/
private Integer doctorId;
/**
* 商品id
*/
private Integer goodsId;
/**
* 商品数量
*/
private Integer num;
/**
* 收货地址ID
*/
private Integer addressId;
}
...@@ -2,10 +2,12 @@ package com.pz.system.domain.vo; ...@@ -2,10 +2,12 @@ package com.pz.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pz.common.annotation.ExcelDictFormat; import com.pz.common.annotation.ExcelDictFormat;
import com.pz.common.convert.ExcelDictConvert; import com.pz.common.convert.ExcelDictConvert;
import lombok.Data; import lombok.Data;
import java.util.Date;
import java.util.List; import java.util.List;
...@@ -81,6 +83,9 @@ public class ArticleVo { ...@@ -81,6 +83,9 @@ public class ArticleVo {
* 是否收藏 * 是否收藏
*/ */
private boolean isCollect; private boolean isCollect;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
/** /**
* 轮播图 * 轮播图
*/ */
......
...@@ -20,7 +20,7 @@ public class UserVsitorVo { ...@@ -20,7 +20,7 @@ public class UserVsitorVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* *
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Integer id; private Integer id;
......
package com.pz.system.service; package com.pz.system.service;
import com.pz.system.domain.TotalOrder; import com.pz.system.domain.TotalOrder;
import com.pz.system.domain.bo.CreateOrderBo;
import com.pz.system.domain.vo.TotalOrderVo; import com.pz.system.domain.vo.TotalOrderVo;
import com.pz.system.domain.bo.TotalOrderBo; import com.pz.system.domain.bo.TotalOrderBo;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
...@@ -38,6 +39,13 @@ public interface ITotalOrderService { ...@@ -38,6 +39,13 @@ public interface ITotalOrderService {
Boolean insertByBo(TotalOrderBo bo); Boolean insertByBo(TotalOrderBo bo);
/** /**
* 小程序创建订单
* @param bo
* @return
*/
TotalOrderVo createOrder(CreateOrderBo bo);
/**
* 修改总订单 * 修改总订单
*/ */
Boolean updateByBo(TotalOrderBo bo); Boolean updateByBo(TotalOrderBo bo);
......
...@@ -142,7 +142,7 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -142,7 +142,7 @@ public class ArticleServiceImpl implements IArticleService {
Page<ArticleVo> result = new Page<>(); Page<ArticleVo> result = new Page<>();
//判断是否展示收藏文章 //判断是否展示收藏文章
if(bo.isCollect()){ if(bo.isCollect()){
List<UserCollect> Collect = userCollectMapper.selectList(Wrappers.<UserCollect>lambdaQuery().eq(UserCollect::getUid, userId)); List<UserCollect> Collect = userCollectMapper.selectList(Wrappers.<UserCollect>lambdaQuery().eq(UserCollect::getUid, userId).eq(UserCollect::getDelFlag,0));
// 获取所有文章id集合 // 获取所有文章id集合
List<Integer> articleIds = Collect.stream() List<Integer> articleIds = Collect.stream()
...@@ -167,8 +167,8 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -167,8 +167,8 @@ public class ArticleServiceImpl implements IArticleService {
if (CollectionUtils.isNotEmpty(articleIds)) { if (CollectionUtils.isNotEmpty(articleIds)) {
List<UserAppreciate> userAppreciates = userAppreciateMapper.selectList(Wrappers.<UserAppreciate>lambdaQuery().in(UserAppreciate::getAid, articleIds)); List<UserAppreciate> userAppreciates = userAppreciateMapper.selectList(Wrappers.<UserAppreciate>lambdaQuery().in(UserAppreciate::getAid, articleIds).eq(UserAppreciate::getDelFlag,0));
List<UserCollect> userCollects = userCollectMapper.selectList(Wrappers.<UserCollect>lambdaQuery().in(UserCollect::getAid, articleIds)); List<UserCollect> userCollects = userCollectMapper.selectList(Wrappers.<UserCollect>lambdaQuery().in(UserCollect::getAid, articleIds).eq(UserCollect::getDelFlag,0));
for (UserAppreciate userAppreciate : userAppreciates) { for (UserAppreciate userAppreciate : userAppreciates) {
Integer articleId = userAppreciate.getAid(); Integer articleId = userAppreciate.getAid();
...@@ -230,7 +230,11 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -230,7 +230,11 @@ public class ArticleServiceImpl implements IArticleService {
@Override @Override
public Boolean insertByAppreciate(UserAppreciateBo bo) { public Boolean insertByAppreciate(UserAppreciateBo bo) {
UserAppreciate add = BeanUtil.toBean(bo, UserAppreciate.class); UserAppreciate add = BeanUtil.toBean(bo, UserAppreciate.class);
UserAppreciate userAppreciate = userAppreciateMapper.selectOne(new LambdaQueryWrapper<UserAppreciate>().eq(UserAppreciate::getUid, bo.getUid()).eq(UserAppreciate::getAid,bo.getAid()).eq(UserAppreciate::getDelFlag,0));
if(null != userAppreciate){
userAppreciateMapper.deleteById(userAppreciate.getId());
return true;
}
boolean flag = userAppreciateMapper.insert(add) > 0; boolean flag = userAppreciateMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setId(add.getId()); bo.setId(add.getId());
...@@ -244,7 +248,11 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -244,7 +248,11 @@ public class ArticleServiceImpl implements IArticleService {
@Override @Override
public Boolean insertByCollect(UserCollectBo bo) { public Boolean insertByCollect(UserCollectBo bo) {
UserCollect add = BeanUtil.toBean(bo, UserCollect.class); UserCollect add = BeanUtil.toBean(bo, UserCollect.class);
UserCollect userCollect = userCollectMapper.selectOne(new LambdaQueryWrapper<UserCollect>().eq(UserCollect::getUid, bo.getUid()).eq(UserCollect::getAid,bo.getAid()).eq(UserCollect::getDelFlag,0));
if(null != userCollect){
userCollectMapper.deleteById(userCollect.getId());
return true;
}
boolean flag = userCollectMapper.insert(add) > 0; boolean flag = userCollectMapper.insert(add) > 0;
if (flag) { if (flag) {
bo.setId(add.getId()); bo.setId(add.getId());
......
...@@ -118,8 +118,8 @@ public class HospitalServiceImpl implements IHospitalService { ...@@ -118,8 +118,8 @@ public class HospitalServiceImpl implements IHospitalService {
lqw.like(StringUtils.isNotBlank(bo.getName()), Hospital::getName, bo.getName()); lqw.like(StringUtils.isNotBlank(bo.getName()), Hospital::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getLogo()), Hospital::getLogo, bo.getLogo()); lqw.eq(StringUtils.isNotBlank(bo.getLogo()), Hospital::getLogo, bo.getLogo());
lqw.eq(bo.getLevel() != null, Hospital::getLevel, bo.getLevel()); lqw.eq(bo.getLevel() != null, Hospital::getLevel, bo.getLevel());
lqw.eq(StringUtils.isNotBlank(bo.getLng()), Hospital::getLng, bo.getLng()); /*lqw.eq(StringUtils.isNotBlank(bo.getLng()), Hospital::getLng, bo.getLng());
lqw.eq(StringUtils.isNotBlank(bo.getLat()), Hospital::getLat, bo.getLat()); lqw.eq(StringUtils.isNotBlank(bo.getLat()), Hospital::getLat, bo.getLat());*/
lqw.eq(bo.getCategory() != null, Hospital::getCategory, bo.getCategory()); lqw.eq(bo.getCategory() != null, Hospital::getCategory, bo.getCategory());
lqw.eq(StringUtils.isNotBlank(bo.getIntroduce()), Hospital::getIntroduce, bo.getIntroduce()); lqw.eq(StringUtils.isNotBlank(bo.getIntroduce()), Hospital::getIntroduce, bo.getIntroduce());
lqw.eq(bo.getStatus() != null, Hospital::getStatus, bo.getStatus()); lqw.eq(bo.getStatus() != null, Hospital::getStatus, bo.getStatus());
......
...@@ -7,6 +7,7 @@ import com.pz.common.core.domain.PageQuery; ...@@ -7,6 +7,7 @@ import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.system.domain.bo.CreateOrderBo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.TotalOrderBo; import com.pz.system.domain.bo.TotalOrderBo;
...@@ -90,6 +91,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -90,6 +91,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
return flag; return flag;
} }
@Override
public TotalOrderVo createOrder(CreateOrderBo bo) {
return null;
}
/** /**
* 修改总订单 * 修改总订单
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment