update

src/main/java/com/gogirl/application/order/serve/OrderManageService.java

@@ -107,8 +107,6 @@ public interface OrderManageService extends IService<OrderManage> {
      */
     List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd);
 
-    Integer countOrderTimes(Integer customerId);
-
     void updateOrderDataIntegrity(OrderManage om);
 
     void confirmOrder(Integer orderId, Integer payType, Integer technicianId);

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

@@ -414,6 +414,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             });
         });
 
+        orderManagePage.setRecords(orderManagePage.getRecords().stream().filter(orderManage -> ListUtil.isNotEmpty(orderManage.getImages())).collect(Collectors.toList()));
         return orderManagePage;
     }
 
@@ -710,10 +711,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         return orderServeList;
     }
 
-    @Override
-    public Integer countOrderTimes(Integer customerId) {
-        return null;
-    }
 
     @Override
     public void updateOrderDataIntegrity(OrderManage om) {

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

@@ -5,6 +5,7 @@ import com.gogirl.application.xcx.GogirlTokenService;
 import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.infrastructure.common.base.JsonResult;
 import com.gogirl.infrastructure.common.exception.RRException;
+import com.gogirl.infrastructure.util.lock.CustomerIdLock;
 import com.gogirl.shared.member.order.command.CreateCommentCommand;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -46,8 +47,14 @@ public class OrderCommentController {
                 .orElseThrow(() -> new RRException(500, "token不存在"));
         cmd.setCurrentCustomerId(currentCustomerId);
         log.info("订单评论开始 **");
-        List<OrderServe> orderServeList = orderManageService.addOrModifyOrderComment(cmd);
-        log.info("订单评论结束 **");
-        return JsonResult.success();
+        CustomerIdLock lock = CustomerIdLock.getInsatance();
+        try {
+            lock.lock(currentCustomerId);
+            List<OrderServe> orderServeList = orderManageService.addOrModifyOrderComment(cmd);
+            log.info("订单评论结束 **");
+            return JsonResult.success(orderServeList);
+        } finally {
+            lock.unlock(currentCustomerId);
+        }
     }
 }

src/main/java/com/gogirl/interfaces/store/OverTimeRecordController.java

@@ -48,8 +48,8 @@ public class OverTimeRecordController {
         page = overtimeRecordMapper.selectPage(page, new LambdaQueryWrapper<OvertimeRecord>()
                 .eq(OvertimeRecord::getTechnicianId, SessionUtils.getTechnicianId())
                 .gt(OvertimeRecord::getLeftTimeLength, 0)
-                .ge(OvertimeRecord::getStartTime, paramDate)
-                .ge(OvertimeRecord::getEndTime, paramDate));
+                .ge(OvertimeRecord::getStartTime, paramDate.getTime())
+                .ge(OvertimeRecord::getEndTime, paramDate.getTime()));
 
         return JsonResult.success(page);
     }