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

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

@@ -32,11 +32,16 @@ public class OrderInfoVO {
     private Float commission;
 
     /**
-     * 项目名称
+     * 服务名称
      */
     private String project;
 
     /**
+     * 业务名称
+     */
+    private String businessName;
+
+    /**
      * 项目封面
      */
     private String cover;
@@ -48,10 +53,14 @@ public class OrderInfoVO {
 
     private String emName;
 
-
     /**
      * 业务ID
      */
     private Integer businessId;
 
+    /**
+     * 是否好评，0-未评价，1-好评，2-差评
+     */
+    private Integer evaluationFlag;
+
 }

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

 package com.pz.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.pz.common.core.page.TableDataInfo;
-import com.pz.common.core.domain.PageQuery;
-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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.exception.ServiceException;
 import com.pz.common.utils.redis.RedisUtils;
 import com.pz.merchant.domain.Employees;
@@ -16,18 +16,17 @@ import com.pz.merchant.mapper.EmployeesMapper;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.datastructure.OrderDelayQueue;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
+import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
-import com.pz.system.domain.YypzOrder;
+import com.pz.system.domain.bo.DbwzOrderBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
+import com.pz.system.domain.vo.DbwzOrderVo;
+import com.pz.system.mapper.DbwzOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.UserVsitorMapper;
+import com.pz.system.service.IDbwzOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import com.pz.system.domain.bo.DbwzOrderBo;
-import com.pz.system.domain.vo.DbwzOrderVo;
-import com.pz.system.domain.DbwzOrder;
-import com.pz.system.mapper.DbwzOrderMapper;
-import com.pz.system.service.IDbwzOrderService;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;

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

@@ -107,10 +107,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         services.name as project,
         services.cover,
         services.price,
+        total_order.is_satisfaction as evaluation_flag,
         employees.name as emName,
         CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission,
-        total_order.business_id as businessId
+        total_order.business_id as businessId,
+        business.name as businessName
         from total_order
+        left join business on total_order.business_id = business.id
         left join employees on total_order.em_id = employees.id
         left join services on total_order.service_id = services.id
         <where>