新增 查看订单评价

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

@@ -60,6 +60,17 @@ public class AccompanyController extends BaseController {
     }
 
     /**
+     * 订单评价 列表
+     *
+     * @param page 分页参数
+     * @return 未分配陪诊员的业务订单
+     */
+    @GetMapping("/demands")
+    public TableDataInfo<AccompanyDemandVo> orderCommentList(@NotNull(message = "陪诊员ID不能为空") Integer emId, PageQuery page) {
+        return totalOrderService.queryOrderComment(emId,page);
+    }
+
+    /**
      * 获取需求广场订单详细信息
      *
      * @param orderId 订单ID

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

@@ -64,4 +64,14 @@ public class AccompanyDemandVo {
      */
     private Integer businessId;
 
+    /**
+     * 评价
+     */
+    private String evaluationContent;
+
+    /**
+     * 是否好评，0-未评价，1-好评，2-差评
+     */
+    private Integer evaluationFlag;
+
 }

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

@@ -97,6 +97,13 @@ public interface ITotalOrderService {
     TableDataInfo<AccompanyDemandVo> queryUndistributedOrder(PageQuery page);
 
     /**
+     * 陪诊员端 评价
+     *
+     * @return 待分配陪诊员订单
+     */
+    TableDataInfo<AccompanyDemandVo> queryOrderComment(Integer emId,PageQuery page);
+
+    /**
      * 陪诊员接单
      *
      * @param emId    陪诊员ID

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

@@ -525,6 +525,34 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
     }
 
     /**
+     * 陪诊员端 订单评价
+     *
+     * @return 待分配陪诊员订单
+     */
+    @Override
+    public TableDataInfo<AccompanyDemandVo> queryOrderComment(Integer emId, PageQuery page) {
+        QueryWrapper<TotalOrder> wrapper = Wrappers.query();
+        // 筛选未分配订单
+        wrapper.eq("total_order.em_id", emId)  // 未分配陪诊员订单
+            .eq("total_order.status", 2) // 订单已完成
+            .between("total_order.business_id", 1, 5);
+        IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
+        // 装载子订单信息
+        result.getRecords().forEach(order -> {
+            ISonOrderService orderService = serviceBuilder.getSonOrderService(order.getBusinessId());
+            SonOrderVo sonOrder;
+            if (orderService != null && (sonOrder = orderService.getSonOrderSimpleDataByTotalId(order.getOrderId())) != null) {
+                order.setAvatar(sonOrder.getAvatar());
+                order.setSonOrderStatus(sonOrder.getOrderStatus());
+                order.setHospital(sonOrder.getHospital());
+                order.setVisitTime(sonOrder.getVisitTime());
+                order.setUserName(sonOrder.getUserName());
+            }
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
      * 陪诊员接单
      *
      * @param emId    陪诊员ID

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

@@ -5,14 +5,17 @@
 <mapper namespace="com.pz.system.mapper.TotalOrderMapper">
 
     <sql id="OrderCommon">
-        select total_order.id as orderId,
-               services.name as project,
+        select total_order.id                          as orderId,
+               business.name                           as project,
                CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
                CONVERT(services.price, decimal(10, 2)) as commission,
                total_order.business_id,
-               total_order.remark as description
+               total_order.remark                      as description,
+               total_order.evaluation_content,
+               total_order.is_satisfaction             as evaluation_flag
         from total_order
                  left join services on total_order.service_id = services.id
+                 left join business on total_order.business_id = business.id
     </sql>
 
     <select id="selectUndistributedTotalOrder" resultType="com.pz.system.domain.vo.AccompanyDemandVo">

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

@@ -55,7 +55,8 @@
 
     <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
         select user.nick_name    as userName,
-               zqgh_order.status as orderStatus
+               zqgh_order.status as orderStatus,
+               user.avatar
         from zqgh_order
                  left join total_order on total_order.id = zqgh_order.order_id
                  left join sys_user as user on user.user_id = total_order.uid