暂存代码

pz-accompany/src/main/java/com/pz/accompany/EmployeesIncomeController.java

@@ -49,4 +49,6 @@ public class EmployeesIncomeController extends BaseController {
         bo.setEcId(employeesVo.getId());
         return iIncomeService.queryByEidList(bo, pageQuery);
     }
+
+
 }

pz-system/src/main/java/com/pz/merchant/domain/vo/SonOrderVo.java

@@ -2,6 +2,8 @@ package com.pz.merchant.domain.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 子订单数据实体
  * <p>created in  2023/9/11 17:18
@@ -22,4 +24,16 @@ public class SonOrderVo {
      */
     private Integer orderStatus;
 
+    /**
+     * 就诊人员头像
+     */
+    private String avatar;
+
+    private String hospital;
+
+    /**
+     * 预约时间
+     */
+    private Date visitTime;
+
 }

pz-system/src/main/java/com/pz/system/domain/vo/AccompanyDemandVo.java

+package com.pz.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Date;
+
+/**
+ * <p>created in  2023/9/13 14:48
+ *
+ * @author WangMin
+ * @version 1.0
+ */
+public class AccompanyDemandVo {
+
+    /**
+     * 主订单ID
+     */
+    private Integer orderId;
+
+    /**
+     * 项目名称
+     */
+    private String project;
+
+    /**
+     * 订单佣金
+     */
+    private Float commission;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 就诊医院
+     */
+    private String hospital;
+
+    /**
+     * 预约时间
+     */
+    private Date visitTime;
+
+    /**
+     * 订单所属业务
+     */
+    @JsonIgnore
+    private Integer bid;
+
+}

pz-system/src/main/java/com/pz/system/mapper/TotalOrderMapper.java

 package com.pz.system.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.pz.merchant.domain.Company;
+import com.pz.merchant.domain.vo.FinanceOrderInfoVo;
 import com.pz.system.domain.TotalOrder;
+import com.pz.system.domain.vo.AccompanyDemandVo;
 import com.pz.system.domain.vo.TotalOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 总订单Mapper接口
@@ -14,4 +23,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TotalOrderMapper extends BaseMapperPlus<TotalOrderMapper, TotalOrder, TotalOrderVo> {
 
+    /**
+     * 获取未分配陪诊员订单
+     *
+     * @param page         分页参数
+     * @param queryWrapper 查询条件
+     * @return 结果
+     */
+    IPage<AccompanyDemandVo> selectUndistributedTotalOrder(IPage<AccompanyDemandVo> page, @Param(Constants.WRAPPER) Wrapper<TotalOrder> queryWrapper);
+
 }

pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java

@@ -2,6 +2,7 @@ package com.pz.system.service;
 
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.bo.CreateOrderBo;
+import com.pz.system.domain.vo.AccompanyDemandVo;
 import com.pz.system.domain.vo.TotalOrderVo;
 import com.pz.system.domain.bo.TotalOrderBo;
 import com.pz.common.core.page.TableDataInfo;
@@ -40,6 +41,7 @@ public interface ITotalOrderService {
 
     /**
      * 小程序创建订单
+     *
      * @param bo
      * @return
      */
@@ -54,4 +56,12 @@ public interface ITotalOrderService {
      * 校验并批量删除总订单信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 陪诊员端 需求广场
+     *
+     * @return 待分配陪诊员订单
+     */
+    TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(PageQuery page);
+
 }

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

 package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
@@ -8,6 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.system.domain.bo.CreateOrderBo;
+import com.pz.system.domain.vo.AccompanyDemandVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.TotalOrderBo;
@@ -36,7 +39,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
      * 查询总订单
      */
     @Override
-    public TotalOrderVo queryById(Long id){
+    public TotalOrderVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -109,8 +112,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(TotalOrder entity){
-        //TODO 做一些数据校验,如唯一约束
+    private void validEntityBeforeSave(TotalOrder entity) {
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -118,9 +121,25 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 陪诊员端 需求广场
+     *
+     * @return 待分配陪诊员订单
+     */
+    @Override
+    public TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(PageQuery page) {
+        QueryWrapper<TotalOrder> wrapper = Wrappers.query();
+        // 筛选未分配订单
+        wrapper.apply("total_order.em_id = 0")
+            .between("total_order.business_id", 1, 5);
+        IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
+
+        return TableDataInfo.build(result);
+    }
 }

pz-system/src/main/resources/mapper/merchant/CompanyMapper.xml

@@ -50,7 +50,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                services.name                                                                                 as project,
                employees.name                                                                                as emName,
                services.cover,
-               services.price,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2))                                                       as commission,
                services.bid

pz-system/src/main/resources/mapper/system/TotalOrderMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pz.system.mapper.TotalOrderMapper">
+
+    <select id="selectUndistributedTotalOrder" resultType="com.pz.system.domain.vo.AccompanyDemandVo">
+        select total_order.id                                                                                as orderId,
+               services.name                                                                                 as project,
+               CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
+               CONVERT(services.price, decimal(10, 2))                                                       as commission,
+               services.bid
+        from total_order
+                 left join services on total_order.service_id = services.id
+        <where>
+            <if test="ew.emptyOfWhere == false">
+                and ${ew.sqlSegment}
+            </if>
+        </where>
+    </select>
+</mapper>