细节修改

c3d65098 · Wangmin · 1f7b5fef · c3d65098 · c3d65098 · c3d65098
Commit c3d65098 authored Sep 15, 2023 by Wangmin
19 changed files
--- a/pz-accompany/src/main/java/com/pz/accompany/AccompanyController.java
+++ b/pz-accompany/src/main/java/com/pz/accompany/AccompanyController.java
@@ -36,7 +36,6 @@ import javax.validation.constraints.NotNull;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("app/accompany")
-@SaIgnore
 public class AccompanyController extends BaseController {
    private final ITotalOrderService totalOrderService;

--- a/pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java
+++ b/pz-applet/src/main/java/com/pz/applet/AppletSysUserController.java
 package com.pz.applet;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.tree.Tree;

--- a/pz-merchant/src/main/java/com/pz/merchant/controller/applet/OrderController.java
+++ b/pz-merchant/src/main/java/com/pz/merchant/controller/applet/OrderController.java
@@ -26,7 +26,6 @@ import javax.validation.constraints.NotNull;
 @RestController()
 @RequestMapping("/app/order")
 @RequiredArgsConstructor
-@SaIgnore
 public class OrderController extends BaseController {
    private final SonOrderServiceBuilder sonOrderServiceBuilder;

--- a/pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java
+++ b/pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java
@@ -50,7 +50,9 @@ public interface ISonOrderService {
     * @param totalId 取消订单
     * @return 操作结果
     */
-    boolean accompanyCancellationOfOrder(Integer totalId);
+    default boolean accompanyCancellationOfOrder(Integer totalId) {
+        throw new UnsupportedOperationException("不支持该操作");
+    }
    /**
     * 陪诊员开始服务

--- a/pz-system/src/main/java/com/pz/system/datastructure/TotalOrderDelayOperator.java
+++ b/pz-system/src/main/java/com/pz/system/datastructure/TotalOrderDelayOperator.java
@@ -23,11 +23,6 @@ public class TotalOrderDelayOperator implements Delayed {
     */
    private Long orderId;
-    public TotalOrderDelayOperator(Long orderId, long expirationTime, Consumer<Long> action) {
-        this.orderId = orderId;
-        this.expirationTime = expirationTime;
-        this.action = action;
-    }
    /**
     * 订单过期时间
@@ -39,6 +34,12 @@ public class TotalOrderDelayOperator implements Delayed {
     */
    private Consumer<Long> action;
+    public TotalOrderDelayOperator(Long orderId, long expirationTime, Consumer<Long> action) {
+        this.orderId = orderId;
+        this.expirationTime = expirationTime;
+        this.action = action;
+    }
    @Override
    public long getDelay(@NotNull TimeUnit unit) {
        // 计算订单到期时间和当前时间的时间差，并返回以指定时间单位表示的延迟时间

--- a/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java
+++ b/pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java
@@ -26,6 +26,11 @@ public class DbwzOrderItemVo extends OrderCommonVo {
    private String department;
    /**
+     * 医生
+     */
+    private String doctor;
+    /**
     * 预约时间
     */
    private Date visitTime;

--- a/pz-system/src/main/java/com/pz/system/mapper/BusinessMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/BusinessMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.Business;
 import com.pz.system.domain.vo.BusinessVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 业务Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-07
 */
+@Mapper
 public interface BusinessMapper extends BaseMapperPlus<BusinessMapper, Business, BusinessVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/DepartmentMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/DepartmentMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.Department;
 import com.pz.system.domain.vo.DepartmentVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 科室Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-07
 */
+@Mapper
 public interface DepartmentMapper extends BaseMapperPlus<DepartmentMapper, Department, DepartmentVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/DoctorMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/DoctorMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.Doctor;
 import com.pz.system.domain.vo.DoctorVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 医生Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-07
 */
+@Mapper
 public interface DoctorMapper extends BaseMapperPlus<DoctorMapper, Doctor, DoctorVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/HospitalMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/HospitalMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.Hospital;
 import com.pz.system.domain.vo.HospitalVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 医院Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-07
 */
+@Mapper
 public interface HospitalMapper extends BaseMapperPlus<HospitalMapper, Hospital, HospitalVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/PaymentRecordMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/PaymentRecordMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.PaymentRecord;
 import com.pz.system.domain.vo.PaymentRecordVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 支付订单Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-12
 */
+@Mapper
 public interface PaymentRecordMapper extends BaseMapperPlus<PaymentRecordMapper, PaymentRecord, PaymentRecordVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/ServicesMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/ServicesMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.Services;
 import com.pz.system.domain.vo.ServicesVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 服务Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-07
 */
+@Mapper
 public interface ServicesMapper extends BaseMapperPlus<ServicesMapper, Services, ServicesVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/StoreGoodsMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/StoreGoodsMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.StoreGoods;
 import com.pz.system.domain.vo.StoreGoodsVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 商品Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-08
 */
+@Mapper
 public interface StoreGoodsMapper extends BaseMapperPlus<StoreGoodsMapper, StoreGoods, StoreGoodsVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/StoreGoodsTagMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/StoreGoodsTagMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.StoreGoodsTag;
 import com.pz.system.domain.vo.StoreGoodsTagVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 商品标签Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-12
 */
+@Mapper
 public interface StoreGoodsTagMapper extends BaseMapperPlus<StoreGoodsTagMapper, StoreGoodsTag, StoreGoodsTagVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/mapper/UserAddressMapper.java
+++ b/pz-system/src/main/java/com/pz/system/mapper/UserAddressMapper.java
@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.UserAddress;
 import com.pz.system.domain.vo.UserAddressVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 /**
 * 用户收货地址Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
 * @author ruoyi
 * @date 2023-09-11
 */
+@Mapper
 public interface UserAddressMapper extends BaseMapperPlus<UserAddressMapper, UserAddress, UserAddressVo> {
 }
--- a/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
@@ -95,8 +95,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
    private final IPayService iPayService;
-    private final SysUserMapper sysUserMapper;
    private final HospitalMapper hospitalMapper;
    private final DoctorMapper doctorMapper;
@@ -692,7 +690,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
        // 筛选未分配订单
        wrapper.apply("total_order.em_id = 0")  // 未分配陪诊员订单
            .in("total_order.status", 0, 1) // 待支付、已支付
-            .between("total_order.business_id", 1, 5);
+            .between("total_order.business_id", 1, 5)
+            .orderByDesc("total_order.id");
        IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
        // 装载子订单信息
        result.getRecords().forEach(order -> {
@@ -720,7 +719,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
        // 筛选未分配订单
        wrapper.eq("total_order.em_id", emId)  // 未分配陪诊员订单
            .eq("total_order.status", 2) // 订单已完成
-            .between("total_order.business_id", 1, 5);
+            .between("total_order.business_id", 1, 5)
+            .orderByDesc("total_order.id");;
        IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
        // 装载子订单信息
        result.getRecords().forEach(order -> {

--- a/pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java
+++ b/pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java
@@ -38,8 +38,6 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
    private final ZqghOrderMapper baseMapper;
-    private final TotalOrderMapper totalOrderMapper;
    /**
     * 查询诊前挂号订单
     */
@@ -179,21 +177,4 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
        return baseMapper.updateById(sonOrder) > 0;
    }
-    /**
-     * 查询诊前挂号 订单详情
-     *
-     * @param totalId 主订单ID
-     * @return 订单详情
-     */
-    @Override
-    public Object getSonOrderDetailDataByTotalId(Integer totalId) {
-        // TODO： 诊前挂号暂时取消
-        // return baseMapper.selectZqghOrderDetailDateByTotalId(totalId);
-        return ISonOrderService.super.getSonOrderDetailDataByTotalId(totalId);
-    }
-    @Override
-    public boolean accompanyCancellationOfOrder(Integer totalId) {
-        throw new UnsupportedOperationException("不支持该操作");
-    }
 }
--- a/pz-system/src/main/resources/mapper/merchant/CompanyMapper.xml
+++ b/pz-system/src/main/resources/mapper/merchant/CompanyMapper.xml
@@ -47,13 +47,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
    <select id="selectAllOrder" resultType="com.pz.merchant.domain.vo.FinanceOrderInfoVo">
        select total_order.id                                                                                as orderId,
               total_order.status                                                                            as orderStatus,
-               services.name                                                                                 as project,
+               business.name                                                                                 as project,
               employees.name                                                                                as emName,
               services.cover,
               CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
               CONVERT(services.price, decimal(10, 2))                                                       as commission,
               services.bid
        from total_order
+            left join business on total_order.business_id = business.id
            left join employees on employees.id = total_order.em_id
            left join services on total_order.service_id = services.id
        <where>

--- a/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
+++ b/pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
@@ -89,7 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               total_order.is_satisfaction             as evaluation_flag,
               total_order.remark                      as description,
               dbwz_order.remark,
-               dbwz_order.voucher
+               dbwz_order.voucher,
+               dbwz_order.indications                  as doctor
        from total_order
                 left join business on total_order.business_id = business.id
                 left join dbwz_order on dbwz_order.order_id = total_order.id