Skip to content

P
peizhen-java
Commit bfc69186 by Wangmin
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
parents ff32f400 7eb2d36f
Showing with 172 additions and 12 deletions
pz-applet/src/main/java/com/pz/applet/AppletCarouselController.java
...@@ -3,7 +3,9 @@ package com.pz.applet; ...@@ -3,7 +3,9 @@ package com.pz.applet;
import com.pz.common.core.controller.BaseController; import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R; import com.pz.common.core.domain.R;
import com.pz.common.core.domain.model.LoginUser;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.helper.LoginHelper;
import com.pz.system.domain.bo.CarouselBo; import com.pz.system.domain.bo.CarouselBo;
import com.pz.system.domain.vo.CarouselVo; import com.pz.system.domain.vo.CarouselVo;
import com.pz.system.domain.vo.HomeVo; import com.pz.system.domain.vo.HomeVo;
......
pz-applet/src/main/java/com/pz/applet/AppletEmployeesController.java
...@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo; ...@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup; import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup; import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType; import com.pz.common.enums.BusinessType;
import com.pz.common.helper.LoginHelper;
import com.pz.common.utils.poi.ExcelUtil; import com.pz.common.utils.poi.ExcelUtil;
import com.pz.merchant.domain.bo.EmployeesBo; import com.pz.merchant.domain.bo.EmployeesBo;
import com.pz.merchant.domain.vo.EmployeesVo; import com.pz.merchant.domain.vo.EmployeesVo;
...@@ -74,7 +75,7 @@ public class AppletEmployeesController extends BaseController { ...@@ -74,7 +75,7 @@ public class AppletEmployeesController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/add") @PostMapping("/add")
public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesCompanyBo bo) {
bo.setUid(1); bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo)); return toAjax(iEmployeesService.insertByEmployeesCompanyBo(bo));
} }
......
pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java
...@@ -70,7 +70,7 @@ public class AppletSysUserController extends BaseController { ...@@ -70,7 +70,7 @@ public class AppletSysUserController extends BaseController {
*/ */
@GetMapping("/getIdentity") @GetMapping("/getIdentity")
public R<UserIdentityVo> getIdentity() { public R<UserIdentityVo> getIdentity() {
return R.ok(userService.checkUserIdentity(3)); return R.ok(userService.checkUserIdentity(LoginHelper.getLoginUser().getUserId().intValue()));
} }
/** /**
...@@ -99,7 +99,7 @@ public class AppletSysUserController extends BaseController { ...@@ -99,7 +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); user.setUserId(LoginHelper.getLoginUser().getUserId());
userService.checkUserAllowed(user); userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId()); userService.checkUserDataScope(user.getUserId());
if (!userService.checkUserNameUnique(user)) { if (!userService.checkUserNameUnique(user)) {
......
pz-applet/src/main/java/com/pz/applet/AppletTotalOrderController.java
...@@ -24,6 +24,7 @@ import javax.validation.constraints.NotEmpty; ...@@ -24,6 +24,7 @@ import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Random;
/** /**
* 总订单 * 总订单
......
pz-applet/src/main/java/com/pz/applet/AppletUserAddressController.java
...@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo; ...@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup; import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup; import com.pz.common.core.validate.EditGroup;
import com.pz.common.enums.BusinessType; import com.pz.common.enums.BusinessType;
import com.pz.common.helper.LoginHelper;
import com.pz.common.utils.poi.ExcelUtil; import com.pz.common.utils.poi.ExcelUtil;
import com.pz.system.domain.bo.UserAddressBo; import com.pz.system.domain.bo.UserAddressBo;
import com.pz.system.domain.vo.UserAddressVo; import com.pz.system.domain.vo.UserAddressVo;
...@@ -65,7 +66,7 @@ public class AppletUserAddressController extends BaseController { ...@@ -65,7 +66,7 @@ public class AppletUserAddressController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAddressBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAddressBo bo) {
bo.setUid(1); bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
return toAjax(iUserAddressService.insertByBo(bo)); return toAjax(iUserAddressService.insertByBo(bo));
} }
......
pz-applet/src/main/java/com/pz/applet/AppletUserVsitorController.java
...@@ -9,6 +9,7 @@ import com.pz.common.core.domain.R; ...@@ -9,6 +9,7 @@ import com.pz.common.core.domain.R;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup; import com.pz.common.core.validate.AddGroup;
import com.pz.common.enums.BusinessType; import com.pz.common.enums.BusinessType;
import com.pz.common.helper.LoginHelper;
import com.pz.system.domain.bo.ServicesBo; import com.pz.system.domain.bo.ServicesBo;
import com.pz.system.domain.bo.UserVsitorBo; import com.pz.system.domain.bo.UserVsitorBo;
import com.pz.system.domain.vo.ServicesVo; import com.pz.system.domain.vo.ServicesVo;
...@@ -46,7 +47,7 @@ public class AppletUserVsitorController extends BaseController { ...@@ -46,7 +47,7 @@ public class AppletUserVsitorController extends BaseController {
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVsitorBo bo) { public R<Void> add(@Validated(AddGroup.class) @RequestBody UserVsitorBo bo) {
bo.setUid(1); bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
return toAjax(iUserVsitorService.insertByBo(bo)); return toAjax(iUserVsitorService.insertByBo(bo));
} }
......
pz-system/src/main/java/com/pz/system/domain/Department.java
...@@ -42,4 +42,10 @@ public class Department extends BaseEntity { ...@@ -42,4 +42,10 @@ public class Department extends BaseEntity {
@TableLogic @TableLogic
private String delFlag; private String delFlag;
@TableField(exist = false)
private Integer value;
@TableField(exist = false)
private String text;
} }
pz-system/src/main/java/com/pz/system/domain/bo/CreateOrderBo.java
...@@ -178,4 +178,14 @@ public class CreateOrderBo extends BaseEntity { ...@@ -178,4 +178,14 @@ public class CreateOrderBo extends BaseEntity {
* 收货地址ID * 收货地址ID
*/ */
private Integer addressId; private Integer addressId;
/**
* 订单号
*/
private Integer orderId;
/**
* 订单状态
*/
private Integer status;
} }
pz-system/src/main/java/com/pz/system/domain/vo/AppOrderVo.java 0 → 100644
package com.pz.system.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import lombok.Data;
/**
* app订单详情
*/
@Data
@ExcelIgnoreUnannotated
public class AppOrderVo {
}
pz-system/src/main/java/com/pz/system/domain/vo/DepartmentVo.java
...@@ -49,5 +49,9 @@ public class DepartmentVo { ...@@ -49,5 +49,9 @@ public class DepartmentVo {
private String label; private String label;
private Integer value;
private String text;
} }
pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java
...@@ -6,6 +6,8 @@ import com.pz.common.annotation.ExcelDictFormat; ...@@ -6,6 +6,8 @@ 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.List;
/** /**
* 总订单视图对象 total_order * 总订单视图对象 total_order
...@@ -103,5 +105,39 @@ public class TotalOrderVo { ...@@ -103,5 +105,39 @@ public class TotalOrderVo {
@ExcelProperty(value = "退款金额") @ExcelProperty(value = "退款金额")
private String refundAmount; private String refundAmount;
/**
* 订单封面
*/
private String cover;
/**
* 订单标题
*/
private String name;
/**
* 陪诊人名称
*/
private String emName;
/**
* 优惠价格
*/
private Double salePrice;
/**
* 服务状态
*/
private Integer serviceStatus;
/**
* 标签
*/
private String tags;
/**
* 陪护时间
*/
private List<String> chaperonageDate;
} }
pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java
...@@ -9,6 +9,7 @@ import com.pz.common.core.domain.PageQuery; ...@@ -9,6 +9,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.common.helper.LoginHelper;
import com.pz.system.domain.ArticleComment; import com.pz.system.domain.ArticleComment;
import com.pz.system.domain.UserAppreciate; import com.pz.system.domain.UserAppreciate;
import com.pz.system.domain.UserCollect; import com.pz.system.domain.UserCollect;
...@@ -67,11 +68,11 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -67,11 +68,11 @@ public class ArticleServiceImpl implements IArticleService {
//收藏数量 //收藏数量
articleVo.setCollectNum(Math.toIntExact(aLong1)); articleVo.setCollectNum(Math.toIntExact(aLong1));
//用户评论 //用户评论
List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id).eq(ArticleComment::getUid, 1)); List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id).eq(ArticleComment::getUid, LoginHelper.getLoginUser().getUserId().intValue()));
for (ArticleCommentVo articleCommentVo : articleCommentVos) { for (ArticleCommentVo articleCommentVo : articleCommentVos) {
if(null != articleCommentVo.getUid()){ if(null != articleCommentVo.getUid()){
SysUser sysUser = sysUserMapper.selectById(1); SysUser sysUser = sysUserMapper.selectById(LoginHelper.getLoginUser().getUserId().intValue());
articleCommentVo.setAvatar(sysUser.getAvatar()); articleCommentVo.setAvatar(sysUser.getAvatar());
articleCommentVo.setUserName(sysUser.getUserName()); articleCommentVo.setUserName(sysUser.getUserName());
} }
...@@ -138,7 +139,7 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -138,7 +139,7 @@ public class ArticleServiceImpl implements IArticleService {
LambdaQueryWrapper<Article> lqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Article> lqw = new LambdaQueryWrapper<>();
//Page<ArticleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); //Page<ArticleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
// TODO 待登录写完修改 // TODO 待登录写完修改
int userId = 1; int userId = LoginHelper.getLoginUser().getUserId().intValue();
Page<ArticleVo> result = new Page<>(); Page<ArticleVo> result = new Page<>();
//判断是否展示收藏文章 //判断是否展示收藏文章
if(bo.getIsCollect() == 1){ if(bo.getIsCollect() == 1){
......
pz-system/src/main/java/com/pz/system/service/impl/DepartmentServiceImpl.java
...@@ -66,6 +66,8 @@ public class DepartmentServiceImpl implements IDepartmentService { ...@@ -66,6 +66,8 @@ public class DepartmentServiceImpl implements IDepartmentService {
List<DepartmentVo> rootMenu = new ArrayList<>(); List<DepartmentVo> rootMenu = new ArrayList<>();
for (DepartmentVo entity : allMenu) { for (DepartmentVo entity : allMenu) {
entity.setLabel(entity.getTitle()); entity.setLabel(entity.getTitle());
entity.setValue(entity.getId());
entity.setText(entity.getTitle());
if (entity.getParentId() == 0) { //父节点是0的，为根节点。 if (entity.getParentId() == 0) { //父节点是0的，为根节点。
rootMenu.add(entity); rootMenu.add(entity);
} }
...@@ -97,8 +99,16 @@ public class DepartmentServiceImpl implements IDepartmentService { ...@@ -97,8 +99,16 @@ public class DepartmentServiceImpl implements IDepartmentService {
for (String num : numberArray) { for (String num : numberArray) {
integerList.add(Integer.parseInt(num.trim())); integerList.add(Integer.parseInt(num.trim()));
} }
List<Department> departments = baseMapper.selectList(new LambdaQueryWrapper<Department>().in(Department::getId, integerList));
return baseMapper.selectList(new LambdaQueryWrapper<Department>().in(Department::getId,integerList)); if(null != departments){
for (Department department : departments) {
department.setValue(department.getId());
department.setText(department.getTitle());
}
}
return departments;
} }
/** /**
......
pz-system/src/main/java/com/pz/system/service/impl/HospitalServiceImpl.java
...@@ -103,7 +103,7 @@ public class HospitalServiceImpl implements IHospitalService { ...@@ -103,7 +103,7 @@ public class HospitalServiceImpl implements IHospitalService {
} }
); );
hospitalVo.setValue(hospitalVo.getId()); hospitalVo.setValue(hospitalVo.getId());
hospitalVo.setText(hospitalVo.getText()); hospitalVo.setText(hospitalVo.getName());
//获取医院科室 //获取医院科室
if (StringUtils.isNotBlank(hospitalVo.getDepartments())) { if (StringUtils.isNotBlank(hospitalVo.getDepartments())) {
//关联科室编号 //关联科室编号
......
pz-system/src/main/java/com/pz/system/service/impl/SysUserServiceImpl.java
...@@ -496,10 +496,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService { ...@@ -496,10 +496,12 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
Employees employees = employeesMapper.selectOne(new LambdaQueryWrapper<Employees>().eq(Employees::getUid, sysUser.getUserId())); Employees employees = employeesMapper.selectOne(new LambdaQueryWrapper<Employees>().eq(Employees::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(2); userIdentityVo.setUserType(2);
userIdentityVo.setEmCmId(employees.getId()); userIdentityVo.setEmCmId(employees.getId());
userIdentityVo.setEmCmStatus(employees.getStatus());
}else if(sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())){ }else if(sysUser.getUserType().equals(UserType.AMERCHANT_USER.getUserType())){
Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, sysUser.getUserId())); Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, sysUser.getUserId()));
userIdentityVo.setUserType(3); userIdentityVo.setUserType(3);
userIdentityVo.setEmCmId(company.getId()); userIdentityVo.setEmCmId(company.getId());
userIdentityVo.setEmCmStatus(company.getStatus());
} }
return userIdentityVo; return userIdentityVo;
} }
......
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.domain.model.LoginUser;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -13,14 +14,15 @@ import com.pz.common.exception.ServiceException; ...@@ -13,14 +14,15 @@ import com.pz.common.exception.ServiceException;
import com.pz.merchant.domain.vo.SonOrderVo; import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.merchant.service.ISonOrderService; import com.pz.merchant.service.ISonOrderService;
import com.pz.merchant.service.impl.SonOrderServiceBuilder; import com.pz.merchant.service.impl.SonOrderServiceBuilder;
import com.pz.common.helper.LoginHelper;
import com.pz.system.domain.*;
import com.pz.system.domain.bo.CreateOrderBo; import com.pz.system.domain.bo.CreateOrderBo;
import com.pz.system.domain.vo.AccompanyDemandVo; import com.pz.system.domain.vo.AccompanyDemandVo;
import com.pz.system.mapper.*;
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;
import com.pz.system.domain.vo.TotalOrderVo; import com.pz.system.domain.vo.TotalOrderVo;
import com.pz.system.domain.TotalOrder;
import com.pz.system.mapper.TotalOrderMapper;
import com.pz.system.service.ITotalOrderService; import com.pz.system.service.ITotalOrderService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -28,6 +30,7 @@ import java.util.List; ...@@ -28,6 +30,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
import java.util.Objects; import java.util.Objects;
import java.util.Random;
/** /**
* 总订单Service业务层处理 * 总订单Service业务层处理
...@@ -43,6 +46,20 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -43,6 +46,20 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
private final SonOrderServiceBuilder serviceBuilder; private final SonOrderServiceBuilder serviceBuilder;
private final YypzOrderMapper yypzOrderMapper;
private final ZqghOrderMapper zqghOrderMapper;
private final ZyphOrderMapper zyphOrderMapper;
private final DbghOrderMapper dbghOrderMapper;
private final DbmyOrderMapper dbmyOrderMapper;
private final DbwzOrderMapper dbwzOrderMapper;
private final StoreOrderMapper storeOrderMapper;
/** /**
* 查询总订单 * 查询总订单
*/ */
...@@ -102,8 +119,55 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -102,8 +119,55 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
return flag; return flag;
} }
@Transactional(rollbackFor = Exception.class)
@Override @Override
public TotalOrderVo createOrder(CreateOrderBo bo) { public TotalOrderVo createOrder(CreateOrderBo bo) {
LoginUser loginUser = LoginHelper.getLoginUser();
bo.setStatus(0);
//组装总订单数据新增
TotalOrder totalOrder = BeanUtil.toBean(bo, TotalOrder.class);
totalOrder.setOrderSn(getOrderSn());
totalOrder.setUid(loginUser.getUserId().intValue());
baseMapper.insert(totalOrder);
bo.setOrderId(totalOrder.getId().intValue());
if(bo.getBusinessId() == 1){//预约陪诊
YypzOrder yypzOrder = BeanUtil.toBean(bo, YypzOrder.class);
yypzOrderMapper.insert(yypzOrder);
}else if(bo.getBusinessId() == 2){//代办挂号
DbghOrder dbghOrder = BeanUtil.toBean(bo, DbghOrder.class);
dbghOrderMapper.insert(dbghOrder);
}else if(bo.getBusinessId() == 3){//代办问诊
DbwzOrder dbwzOrder = BeanUtil.toBean(bo, DbwzOrder.class);
dbwzOrderMapper.insert(dbwzOrder);
}else if(bo.getBusinessId() == 4){//住院陪护
ZyphOrder zyphOrder = BeanUtil.toBean(bo, ZyphOrder.class);
zyphOrderMapper.insert(zyphOrder);
}else if(bo.getBusinessId() == 5){//代办买药
DbmyOrder dbmyOrder = BeanUtil.toBean(bo, DbmyOrder.class);
dbmyOrderMapper.insert(dbmyOrder);
}else if(bo.getBusinessId() == 6){//诊前挂号
ZqghOrder zqghOrder = BeanUtil.toBean(bo, ZqghOrder.class);
zqghOrderMapper.insert(zqghOrder);
}else if(bo.getBusinessId() == 0){//商城订单
StoreOrder storeOrder = BeanUtil.toBean(bo, StoreOrder.class);
storeOrderMapper.insert(storeOrder);
}
return null; return null;
} }
...@@ -214,4 +278,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -214,4 +278,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
} }
return order; return order;
} }
public String getOrderSn(){
long timestamp = System.currentTimeMillis();
String timestampStr = Long.toString(timestamp);
Random random = new Random();
int randomNum = random.nextInt(100000000);
String randomStr = String.format("%08d", randomNum); // 将随机数转换为指定长度的字符串
return timestampStr + randomStr;
}
} }
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