小程序订单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/OrderController.java

@@ -1,31 +1,27 @@
 package com.ruoyi.web.controller.info;
 
-import java.util.List;
-import java.util.Arrays;
-
-import lombok.RequiredArgsConstructor;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.info.order.domain.vo.OrderVo;
 import com.ruoyi.info.order.domain.bo.OrderBo;
+import com.ruoyi.info.order.domain.vo.OrderVo;
 import com.ruoyi.info.order.service.IOrderService;
-import com.ruoyi.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 订单Controller
@@ -49,7 +45,7 @@ public class OrderController extends BaseController {
     @SaCheckPermission("order:order:list")
     @GetMapping("/page")
     public TableDataInfo<OrderVo> page(@Validated(QueryGroup.class) OrderBo bo, PageQuery pageQuery) {
-        return iOrderService.queryPageList(bo, pageQuery);
+        return iOrderService.queryAllPageList(bo, pageQuery);
     }
 
     /**
@@ -64,43 +60,6 @@ public class OrderController extends BaseController {
         return R.ok(iOrderService.queryById(id));
     }
 
-    /**
-     * 新增订单
-     */
-    @ApiOperation("新增订单")
-    @SaCheckPermission("order:order:add")
-    @Log(title = "订单", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping("/add")
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderBo bo) {
-        return toAjax(iOrderService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改订单
-     */
-    @ApiOperation("修改订单")
-    @SaCheckPermission("order:order:edit")
-    @Log(title = "订单", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PostMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderBo bo) {
-        return toAjax(iOrderService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除订单
-     */
-    @ApiOperation("删除订单")
-    @SaCheckPermission("order:order:remove")
-    @Log(title = "订单", businessType = BusinessType.DELETE)
-    @PostMapping("/del/{ids}")
-    public R<Void> remove(@ApiParam("主键串")
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        return toAjax(iOrderService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
-    }
-
     /**
      * 导出订单列表
      */
@@ -109,7 +68,7 @@ public class OrderController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated OrderBo bo, HttpServletResponse response) {
-        List<OrderVo> list = iOrderService.queryList(bo);
+        List<OrderVo> list = iOrderService.queryAllList(bo);
         ExcelUtil.exportExcel(list, "订单", OrderVo.class, response);
     }
 

ruoyi-info/pom.xml

@@ -32,6 +32,11 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-base</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-user</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-info/src/main/java/com/ruoyi/info/hospital/domain/bo/HospitalDepartmentBo.java

@@ -39,7 +39,7 @@ public class HospitalDepartmentBo extends BaseEntity {
      * 医院id
      */
     @ApiModelProperty(value = "医院id", required = true)
-    @NotBlank(message = "医院id不能为空", groups = { AddGroup.class, EditGroup.class, QueryGroup.class })
+    @NotNull(message = "医院id不能为空", groups = { AddGroup.class, EditGroup.class, QueryGroup.class })
     private Long hospitalId;
 
     /**

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/bo/OrderBo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.info.order.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -113,5 +115,19 @@ public class OrderBo extends BaseEntity {
     @ApiModelProperty(value = "应付价格", required = true)
     private BigDecimal totalPrice;
 
+    /**
+     * 开始日期(查询用)
+     */
+    @ApiModelProperty(value = "开始日期(查询用)", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
 
+    /**
+     * 结束日期(查询用)
+     */
+    @ApiModelProperty(value = "结束日期(查询用)", required = true)
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/domain/vo/OrderVo.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
 import com.ruoyi.info.order.enums.CancellationMethod;
 import com.ruoyi.info.order.enums.OrderStatus;
+import com.ruoyi.info.patient.domain.vo.PatientVo;
 import com.ruoyi.info.service.enums.ServiceUnit;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,6 +48,10 @@ public class OrderVo {
     @ExcelProperty(value = "C端用户ID")
     @ApiModelProperty("C端用户ID")
     private Long userId;
+    @ApiModelProperty(value = "C端用户名称")
+    private String userName;
+    @ApiModelProperty(value = "C端用户手机号")
+    private String userMobile;
 
     /**
      * 状态
@@ -93,10 +98,8 @@ public class OrderVo {
     @ExcelProperty(value = "就诊人ID")
     @ApiModelProperty("就诊人ID")
     private Long patientId;
-    @ApiModelProperty("就诊人名字")
-    private String patientName;
-    @ApiModelProperty("就诊人手机号")
-    private String patientPhone;
+    @ApiModelProperty("就诊人信息")
+    private PatientVo patientVo;
 
     /**
      * 服务ID

ruoyi-info/src/main/java/com/ruoyi/info/order/mapper/OrderMapper.java

@@ -1,8 +1,14 @@
 package com.ruoyi.info.order.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.info.order.domain.Order;
+import com.ruoyi.info.order.domain.bo.OrderBo;
 import com.ruoyi.info.order.domain.vo.OrderVo;
-import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 订单Mapper接口
@@ -12,4 +18,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface OrderMapper extends BaseMapperPlus<OrderMapper, Order, OrderVo> {
 
+    Page<OrderVo> queryAllPageList(@Param("bo") OrderBo bo, @Param("page") PageQuery pageQuery);
+
+    List<OrderVo> queryAllList(@Param("bo") OrderBo bo);
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/service/IOrderService.java

@@ -75,4 +75,8 @@ public interface IOrderService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     boolean cancel(Long id, Long userId);
+
+    TableDataInfo<OrderVo> queryAllPageList(OrderBo bo, PageQuery pageQuery);
+
+    List<OrderVo> queryAllList(OrderBo bo);
 }

ruoyi-info/src/main/java/com/ruoyi/info/order/service/impl/OrderServiceImpl.java

@@ -21,13 +21,14 @@ import com.ruoyi.info.order.enums.OrderStatus;
 import com.ruoyi.info.order.exception.OrderExceptionEnum;
 import com.ruoyi.info.order.mapper.OrderMapper;
 import com.ruoyi.info.order.service.IOrderService;
-import com.ruoyi.info.patient.domain.vo.PatientVo;
 import com.ruoyi.info.patient.service.IPatientService;
 import com.ruoyi.info.service.domain.ServiceProduct;
 import com.ruoyi.info.service.domain.vo.ServiceProductVo;
 import com.ruoyi.info.service.service.IServiceProductService;
 import com.ruoyi.system.enums.SequencePrefixEnum;
 import com.ruoyi.system.service.ISysSequenceService;
+import com.ruoyi.user.domain.User;
+import com.ruoyi.user.service.IUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -54,6 +55,7 @@ public class OrderServiceImpl implements IOrderService {
     private final IHospitalService hospitalService;
     private final IHospitalDepartmentService hospitalDepartmentService;
     private final IPatientService patientService;
+    private final IUserService userService;
 
     /**
      * 查询订单分页
@@ -113,16 +115,18 @@ public class OrderServiceImpl implements IOrderService {
         //科室
         vo.setHospitalDepartmentName(hospitalDepartmentService.queryNameById(vo.getHospitalDepartmentId()));
         //就诊人
-        PatientVo patientVo = patientService.queryDelById(vo.getPatientId());
-        if (ObjectUtil.isNotNull(patientVo)) {
-            vo.setPatientName(patientVo.getName());
-            vo.setPatientPhone(patientVo.getMobile());
-        }
+        vo.setPatientVo(patientService.queryDelById(vo.getPatientId()));
         //服务
         ServiceProductVo serviceProductVo = serviceProductService.queryDelById(vo.getServiceId());
         if (ObjectUtil.isNotNull(serviceProductVo)) {
             vo.setServiceName(serviceProductVo.getName());
         }
+        //用户
+        User user = userService.getById(vo.getUserId(), false);
+        if (ObjectUtil.isNotNull(user)) {
+            vo.setUserName(user.getNickname());
+            vo.setUserMobile(user.getMobile());
+        }
         return vo;
     }
 
@@ -229,4 +233,15 @@ public class OrderServiceImpl implements IOrderService {
         return baseMapper.updateById(order) > 0;
     }
 
+    @Override
+    public TableDataInfo<OrderVo> queryAllPageList(OrderBo bo, PageQuery pageQuery) {
+        Page<OrderVo> result = baseMapper.queryAllPageList(bo, pageQuery);
+        return TableDataInfo.build(result);
+    }
+
+    @Override
+    public List<OrderVo> queryAllList(OrderBo bo) {
+        return baseMapper.queryAllList(bo);
+    }
+
 }

ruoyi-info/src/main/resources/mapper/order/OrderMapper.xml

@@ -28,5 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <select id="queryAllPageList" resultType="com.ruoyi.info.order.domain.vo.OrderVo">
+
+    </select>
+
+    <select id="queryAllList" resultType="com.ruoyi.info.order.domain.vo.OrderVo">
+
+    </select>
+
 
 </mapper>

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -109,7 +109,7 @@ public class SysOssServiceImpl implements ISysOssService {
 
     @Override
     public SysOss apiUpload(MultipartFile file) {
-        return this.uploadFile(file);
+        return this.localUpload(file);
     }
 
     private SysOss uploadFile(MultipartFile file) {