订单评价页面查询兜底处理

src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java

@@ -897,7 +897,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
 
         log.info("更新预约:{}", cmd);
 
-
         ScheduleManage scheduleManage = this.setScheduleServe(cmd.getScheduleManageDTO(), cmd.getDefaultNodeList());
         if (SessionUtils.isSourceFromCustomer()) {
             this.validSubmit(scheduleManage);

src/main/java/com/gogirl/domain/order/mall/MallOrderAddress.java

@@ -31,6 +31,7 @@ public class MallOrderAddress {
     @ApiModelProperty("地区")
     private String area;
 
+    @ApiModelProperty("街道")
     private String street;
 
     @ApiModelProperty("收货物手机号")

src/main/java/com/gogirl/domain/store/oa/TakeLeaveEvent.java

@@ -24,6 +24,7 @@ public class TakeLeaveEvent {
     public static final Integer STATUS_UN_APPROVAL = 1;
     public static final Integer STATUS_APPROVAL_PASS = 2;
     public static final Integer STATUS_APPROVAL_REFUSE = 3;
+
     /**
      * type
      */
@@ -41,7 +42,7 @@ public class TakeLeaveEvent {
     @ApiModelProperty("请假美甲师id")
     private Integer applyTechnicianId;
 
-    @ApiModelProperty("1-加班 2-调休 3-事假 4-病假 5-外出 6-婚假 7-生日假")
+    @ApiModelProperty("1-加班 2-调休 3-事假 4-病假 5-外出 6-年假 7-生日假")
     private Integer type;
 
     @ApiModelProperty("开始时间")

src/main/java/com/gogirl/infrastructure/util/lock/CustomerIdLock.java

@@ -4,9 +4,11 @@ import java.util.HashMap;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- *  * 分段锁，系统提供一定数量的原始锁，根据传入用户id值获取对应的锁并加锁  * 注意：要锁的用户id值如果发生改变，有可能导致锁无法成功释放!!!
+ * 分段锁，系统提供一定数量的原始锁，根据传入用户id值获取对应的锁并加锁
+ * 注意：要锁的用户id值如果发生改变，有可能导致锁无法成功释放!!!
  */
 public class CustomerIdLock {
+
     private final static HashMap<Integer, ReentrantLock> lockMap = new HashMap<>();
     private Integer segments = 500;// 默认分段数量
 

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -114,8 +114,13 @@ public class OrderManageController {
     @ApiOperation(value = "查询订单")
     @GetMapping(value = "/customer/ordermanage/queryOrderForComment")
     public JsonResult<OrderManage> queryOrderForComment(@RequestParam Integer id) {
-        OrderManage orderManage = orderManageService.queryOrderForComment(id);
-        return JsonResult.success(orderManage);
+        try {
+            //外层兜底处理查询历史订单
+            OrderManage orderManage = orderManageService.queryOrderForComment(id);
+            return JsonResult.success(orderManage);
+        } catch (Exception e) {
+            throw new RRException("您已经评价过该订单");
+        }
     }
 
 

src/main/resources/application-dev.yml

@@ -43,7 +43,8 @@ spring:
 
   #redis配置
   redis:
-    host: 127.0.0.1t
+    #    host: host.docker.internal
+    host: 127.0.0.1
     port: 6379
     database: 0
     lettuce:
@@ -67,8 +68,6 @@ spring:
             required: true
     port: 465
 
-
-
 #项目属性
 gogirl:
   #充值回调地址
@@ -92,9 +91,10 @@ gogirl:
   #门店上班时间
   start-time: "10:00:00"
   #评论延迟时间
-  test-paper-time: 1440
+  test-paper-time: 1
   #后台后端接口访问地址
   admin-backend-url: http://test.admin.begogirls.com:7712/api/ReportTable/GetTechnicianPage
+
   admin-backend-achievements-url: http://test.admin.begogirls.com:7712/api/salary/AchievementsPersonaResultPageApi
 
 wx:
@@ -105,4 +105,4 @@ wx:
     keyPath: "/usr/local/src/gogirl/gogirl-payment/apiclient_cert.p12"
 
 server:
-  port: 5444
+  port: 5555
\ No newline at end of file

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: dev
   servlet:
     #文件上传最大容量
     multipart: