Merge branch 'master' into 3.7

# Conflicts:
#	src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

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

@@ -2,6 +2,7 @@ package com.gogirl.interfaces.order.serve;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gogirl.application.market.coupon.MarketService;
 import com.gogirl.application.order.serve.OrderManageService;
 import com.gogirl.application.order.serve.OrderRecordService;
 import com.gogirl.application.order.serve.OrderServeService;
@@ -66,6 +67,7 @@ public class OrderManageController {
     private final OrderCommentMapper orderCommentMapper;
     private final OrderManageDTOAssembler orderManageDTOAssembler;
     private final ScheduleManageService scheduleManageService;
+    private final MarketService marketService;
     private final OrderRecordService orderRecordService;
 
 
@@ -252,4 +254,19 @@ public class OrderManageController {
         });
         return JsonResult.success(orderCommentIPage);
     }
+
+
+    @ApiOperation("重算业绩")
+    @GetMapping("/technician/ordermanage/no_achievementReCalc/{orderId}")
+    public JsonResult<Void> achievementReCalc(@PathVariable Integer orderId) {
+        marketService.achievementReCalc(orderId);
+        return JsonResult.success();
+    }
+
+    @ApiOperation("重算订单金额")
+    @GetMapping("/technician/ordermanage/no_calcOrderAmount/{orderId}")
+    public JsonResult<Void> calcOrderAmount(@PathVariable Integer orderId) {
+        marketService.calcOrderAmount(orderId);
+        return JsonResult.success();
+    }
 }
\ No newline at end of file

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

@@ -10,6 +10,7 @@
             or (start_time >= #{startTime} and end_time <= #{endTime}))
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3
+          and type != 2
     </select>
 
     <select id="takeLeaveId" resultType="com.gogirl.domain.store.oa.OvertimeRecord">