更新

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -128,8 +128,8 @@ public class OrderController extends AbstractController {
 
     @ApiOperation("骑手评价展示")
     @GetMapping(value = "/evaluateRiderPage")
-    public Result evaluateRiderPage(String riderName,String phone,String orderNumber,String userName,String shopName,Integer riderScore,String start,String end,Integer page, Integer limit) {
-        return evaluateRiderService.evaluateRiderPage(riderName,phone,orderNumber,userName,shopName,riderScore,start,end,page,limit);
+    public Result evaluateRiderPage(String riderName,String phone,String orderNumber,String userPhone,String shopName,Integer riderScore,String start,String end,Integer page, Integer limit) {
+        return evaluateRiderService.evaluateRiderPage(riderName,phone,orderNumber,userPhone,shopName,riderScore,start,end,page,limit);
     }
 
     @ApiOperation("删除骑手评价")

src/main/java/com/sqx/modules/order/dao/EvaluateRiderDao.java

@@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface EvaluateRiderDao extends BaseMapper<EvaluateRider> {
-    IPage<EvaluateRider> evaluateRiderPage(Page<EvaluateRider> evaluateRiderPage, @Param("riderName") String riderName,@Param("phone") String phone,@Param("orderNumber") String orderNumber,@Param("userName") String userName,@Param("shopName") String shopName,@Param("riderScore") Integer riderScore,@Param("start") String start,@Param("end") String end);
+    IPage<EvaluateRider> evaluateRiderPage(Page<EvaluateRider> evaluateRiderPage, @Param("riderName") String riderName,@Param("phone") String phone,@Param("orderNumber") String orderNumber,@Param("userPhone") String userPhone,@Param("shopName") String shopName,@Param("riderScore") Integer riderScore,@Param("start") String start,@Param("end") String end);
 
 }

src/main/java/com/sqx/modules/order/entity/EvaluateRider.java

@@ -42,11 +42,11 @@ public class EvaluateRider {
     private String avatar;
 
     @TableField(exist = false)
-    @ApiModelProperty("用户名称")
-    private String userName;
+    @ApiModelProperty("用户手机号")
+    private String userPhone;
 
     @TableField(exist = false)
-    @ApiModelProperty("用户名称")
+    @ApiModelProperty("骑手名称")
     private String riderName;
 
     @TableField(exist = false)

src/main/java/com/sqx/modules/order/service/EvaluateRiderService.java

@@ -5,5 +5,5 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.order.entity.EvaluateRider;
 
 public interface EvaluateRiderService extends IService<EvaluateRider> {
-    Result evaluateRiderPage(String riderName, String phone, String orderNumber, String userName, String shopName,Integer riderScore, String start, String end, Integer page, Integer limit);
+    Result evaluateRiderPage(String riderName, String phone, String orderNumber, String userPhone, String shopName,Integer riderScore, String start, String end, Integer page, Integer limit);
 }

src/main/java/com/sqx/modules/order/service/impl/EvaluateRiderServiceImpl.java

@@ -18,9 +18,9 @@ public class EvaluateRiderServiceImpl extends ServiceImpl<EvaluateRiderDao, Eval
     private EvaluateRiderDao evaluateRiderDao;
 
     @Override
-    public Result evaluateRiderPage(String riderName, String phone, String orderNumber, String userName, String shopName, Integer riderScore, String start, String end, Integer page, Integer limit) {
+    public Result evaluateRiderPage(String riderName, String phone, String orderNumber, String userPhone, String shopName, Integer riderScore, String start, String end, Integer page, Integer limit) {
         Page<EvaluateRider> evaluateRiderPage = new Page<>(page,limit);
-        IPage<EvaluateRider> riderPage =evaluateRiderDao.evaluateRiderPage(evaluateRiderPage,riderName,phone,orderNumber,userName,shopName,riderScore,start,end);
+        IPage<EvaluateRider> riderPage =evaluateRiderDao.evaluateRiderPage(evaluateRiderPage,riderName,phone,orderNumber,userPhone,shopName,riderScore,start,end);
         PageUtils pageUtils = new PageUtils(riderPage);
         return Result.success().put("data", pageUtils);
     }

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: prod
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8

src/main/resources/mapper/dataCentre/dataCenterMapper.xml

@@ -165,7 +165,7 @@
         ( SELECT ifnull( sum( rider_money ), 0 ) AS moneyOrder, i.rider_user_id, u.nick_name as nickName, u.avatar as
         avatar,
         i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName,
-        u.user_name as riderNickName,u.balance as riderBalance
+        u.user_name as riderNickName,u.balance as riderBalance,u.phone as riderPhone
         FROM tb_indent i left join tb_user u on i.rider_user_id = u.user_id
         left join rider_station rs on u.rider_station_id=rs.id
         WHERE i.rider_user_id IS NOT NULL and i.indent_state = 6

src/main/resources/mapper/order/EvaluateRiderMapper.xml

@@ -6,7 +6,7 @@
     <select id="evaluateRiderPage" resultType="com.sqx.modules.order.entity.EvaluateRider">
         SELECT
         er.*,
-        u1.user_name as userName,
+        u1.phone as userPhone,
         u1.avatar,
         u2.user_name as riderName,
         u2.phone,
@@ -14,7 +14,7 @@
         FROM
         `evaluate_rider` er
         LEFT JOIN tb_user u1 ON er.user_id = u1.user_id
-        LEFT JOIN tb_user u2 ON er.rider_user_id = u1.user_id
+        LEFT JOIN tb_user u2 ON er.rider_user_id = u2.user_id
         LEFT JOIN goods_shop gs ON er.shop_id = gs.shop_id
         where 1 = 1
         <if test="riderName!=null and riderName!=''">
@@ -26,8 +26,8 @@
         <if test="orderNumber!=null and orderNumber!=''">
             and er.order_number like concat('%',#{orderNumber},'%')
         </if>
-        <if test="userName!=null and userName!=''">
-            and u1.user_name like concat('%',#{userName},'%')
+        <if test="userPhone!=null and userPhone!=''">
+            and u1.phone like concat('%',#{userPhone},'%')
         </if>
         <if test="shopName!=null and shopName!=''">
             and gs.shop_name like concat('%',#{shopName},'%')