update

src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java

@@ -142,23 +142,23 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
             throw new RRException(500, "审批状态异常");
         }
 
-        //加班申请通过 添加加班记录
-        if (takeLeaveEvent.getType().equals(TakeLeaveEvent.TYPE_OVER_TIME)
-                && cmd.getApproval().equals(TakeLeaveEvent.STATUS_APPROVAL_PASS)) {
-
-            OvertimeRecord overtimeRecord = OvertimeRecord.builder()
-                    .createTime(System.currentTimeMillis())
-                    .startTime(takeLeaveEvent.getStartTime())
-                    .endTime(takeLeaveEvent.getEndTime())
-                    .lastUpdateTime(System.currentTimeMillis())
-                    .leftTimeLength(takeLeaveEvent.getTimeLength())
-                    .status(1)
-                    .totalTimeLength(takeLeaveEvent.getTimeLength())
-                    .technicianId(takeLeaveEvent.getApplyTechnicianId())
-                    .takeLeaveEventId(cmd.getTakeLeaveEventId())
-                    .build();
-            overtimeRecordRepository.insert(overtimeRecord);
-        }
+//        //加班申请通过 添加加班记录
+//        if (takeLeaveEvent.getType().equals(TakeLeaveEvent.TYPE_OVER_TIME)
+//                && cmd.getApproval().equals(TakeLeaveEvent.STATUS_APPROVAL_PASS)) {
+//
+//            OvertimeRecord overtimeRecord = OvertimeRecord.builder()
+//                    .createTime(System.currentTimeMillis())
+//                    .startTime(takeLeaveEvent.getStartTime())
+//                    .endTime(takeLeaveEvent.getEndTime())
+//                    .lastUpdateTime(System.currentTimeMillis())
+//                    .leftTimeLength(takeLeaveEvent.getTimeLength())
+//                    .status(1)
+//                    .totalTimeLength(takeLeaveEvent.getTimeLength())
+//                    .technicianId(takeLeaveEvent.getApplyTechnicianId())
+//                    .takeLeaveEventId(cmd.getTakeLeaveEventId())
+//                    .build();
+//            overtimeRecordRepository.insert(overtimeRecord);
+//        }
 
 
         //调休申请拒绝

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -51,7 +51,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -100,11 +99,6 @@ public class Schedule {
     private final MallCategoryMapper mallCategoryMapper;
 
     /**
-     * rpc
-     */
-    private final RestTemplate restTemplate;
-
-    /**
      * config
      */
     private final GogirlProperties gogirlProperties;
@@ -189,16 +183,17 @@ public class Schedule {
                 }
                 customerBalanceRecord.setRefereeId(referee_ids.toString());
             }
+
             //如果店铺id不为空
             if (cbrt != null && cbrt.getDepartmentId() != null) {
                 customerBalanceRecord.setDepartmentId(cbrt.getDepartmentId());
             }
 
-            if (customerBalanceRecord.getId() != null
-                    && (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
+            if (customerBalanceRecord.getId() != null && (customerBalanceRecord.getRefereeId() != null || customerBalanceRecord.getDepartmentId() != null)) {
                 balanceRecordDao.updateById(customerBalanceRecord);
             }
         }
+
         log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
     }
 
@@ -666,4 +661,6 @@ public class Schedule {
 
         mallProductMapper.syncMallProductIndexTitle(mallCategory.getId());
     }
+
+
 }

src/main/java/com/gogirl/interfaces/order/mall/MallOrderController.java

@@ -69,6 +69,7 @@ public class MallOrderController {
     @PostMapping("/customer/mallOrder/listMallOrderAggregate")
     public JsonResult<IPage<MallOrder>> listMallOrderAggregate(@RequestHeader String token,
                                                                @RequestBody ListMallOrderRequest reqDTO) {
+
         Integer currentCustomerId = SessionUtils.getCustomerId();
         Page<MallOrder> page = new Page<>();
         page.setCurrent(reqDTO.getPageIndex());

src/test/java/com/gogirl/Test.java

@@ -503,4 +503,52 @@ public class Test {
             couponCustomerRelevanceMapper.updateById(couponCustomerRelevance);
         });
     }
+
+    @org.junit.Test
+    public void testReferId() {
+
+
+        log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务开始");
+
+        SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
+
+        String day = yyyyMMdd.format(new Date());
+
+        log.debug("设置推荐人:当天服务的技师为推荐人");
+        Map<String, String> mapTechnicianManage = new HashMap<>();
+        List<StoreTechnician> listTechnicianManage = storeTechnicianService.listTechnicianForPage(new StoreTechnician());
+
+        //查出所有的技师,找到技师id和user_id
+        for (StoreTechnician item : listTechnicianManage) {
+            mapTechnicianManage.put(String.valueOf(item.getTechnicianId()), String.valueOf(item.getUserId()));
+        }
+
+
+        CustomerBalanceRecord customerBalanceRecord = new CustomerBalanceRecord();
+        customerBalanceRecord.setRefereeId("92,92,108,108,108,108");
+
+        //推荐人列表
+        Map<String, String> map = new HashMap<>();
+        //推荐人id
+        StringBuilder referee_ids = new StringBuilder();
+        //充值记录
+        //每次都修改推荐人,且每晚都会设置推荐人
+        if (customerBalanceRecord.getRefereeId() != null) {
+            String[] arr = customerBalanceRecord.getRefereeId().split(",");
+            //
+            for (String s : arr) {
+                if (!map.containsKey(s)) {
+                    map.put(s, s);
+                    referee_ids.append(",").append(mapTechnicianManage.get(s));
+                }
+            }
+            //去掉首尾,
+            if (referee_ids.toString().startsWith(",")) {
+                referee_ids = new StringBuilder(referee_ids.substring(1));
+            }
+            customerBalanceRecord.setRefereeId(referee_ids.toString());
+        }
+
+        System.out.println(customerBalanceRecord.getRefereeId());
+    }
 }