修复bug

ruoyi-admin/src/main/resources/application-druid-root.yml

@@ -57,7 +57,7 @@ wechat:
     secret: 你的微信服务号密钥
     merchantId: 1665639691
 #    privateKeyPath: /data/software/app/key/apiclient_key.pem
-    privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
+    privateKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
 #    privateKeyPath:  /root/pem/apiclient_key.pem
 #    privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
     #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem
@@ -133,7 +133,7 @@ wechat-admin:
     staffAppId: wx01f0f43759922fda
     staffSecret: b0a5617e6e4c387262a32af2b355c8b6
 #    publicKeyPath: /root/pem/pub_key.pem
-    publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem
+    publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem
 #    publicKeyPath: /data/software/app/key/pub_key.pem
     publicKeyId: PUB_KEY_ID_0116656396912025062400291558001601
     pay:

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java

@@ -38,6 +38,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -215,7 +216,7 @@ public class ApiMallOrderController extends BaseController {
         Member member = memberWechatService.isRegister(openId);
 
         evaluation.setMemberId(member.getId());
-
+        evaluation.setCreateTime(LocalTime.now());
         service.orderEvaluate(evaluation);
 
         return AjaxResult.success();

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.applet.contoller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyl.manager.staff.domain.vo.StaffVO;
+import com.cyl.manager.ums.mapper.MemberMapper;
 import com.ruoyi.applet.mallpojo.TeacherListRequest;
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.model.domain.*;
 import com.ruoyi.model.service.*;
@@ -11,10 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -37,6 +37,10 @@ public class ApiMallUserTeacherController extends BaseController {
     private IAppletAddressService appletAddressService;
     @Autowired
     private IAppletOutDateService appletOutDateService;
+    @Autowired
+    private IOmsOrderEvaluationService omsOrderEvaluationService;
+    @Autowired
+    private MemberMapper memberMapper;
 
     //mall-首页周边伴宠师
     @ApiOperation("mall-首页周边伴宠师接口")
@@ -294,6 +298,21 @@ public class ApiMallUserTeacherController extends BaseController {
         return appUsers;
     }
 
+    //mall端-查询指定伴宠师近期评价
+    @ApiOperation("mall端-查询指定伴宠师近期评价")
+    @GetMapping("/getTeacherEvaluate")
+    public AjaxResult getTeacherEvaluate(@RequestParam String id) {
+
+        Page<OmsOrderEvaluation> page = omsOrderEvaluationService.lambdaQuery()
+                .eq(OmsOrderEvaluation::getTechnicianId, id)
+                .page(new Page<>(1, 10));
+
+        for (OmsOrderEvaluation record : page.getRecords()) {
+            record.setMember(memberMapper.selectById(record.getMemberId()));
+        }
+
+        return AjaxResult.success(page);
+    }
 
 
 

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/OmsOrderEvaluation.java

@@ -1,8 +1,13 @@
 package com.ruoyi.model.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.cyl.manager.ums.domain.Member;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
+
+import java.time.LocalTime;
+
 /**
  * 订单评价对象 oms_order_evaluation
  * 
@@ -35,5 +40,11 @@ public class OmsOrderEvaluation {
     @Excel(name = "技师ID")
     private Long technicianId;
 
+    @Excel(name = "评价时间")
+    private LocalTime createTime;
+
+
+    @TableField(exist = false)
+    private Member member;//会员信息
 
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOutDateMapper.java

@@ -5,7 +5,6 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.model.domain.AppletOutDate;
 import org.apache.ibatis.annotations.Delete;
-import sun.misc.VM;
 
 /**
  * 不接单日期Mapper接口