促销员打卡-选择店铺修改为原逻辑

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityClockCoreController.java

@@ -38,15 +38,15 @@ public class TemporaryActivityClockCoreController {
     private RedisCache redisCache;
 
     /**
-     * 促销员当日打卡信息保存
+     * todo 促销员当日打卡信息保存
      */
     @PostMapping("/today/clock")
     public R clockInTodayActivity(@RequestBody TemporaryClockVo clockVo) {
         clockVo.validate();
         Integer clockType = clockVo.getClockType();
         boolean isClockIn = ClockType.TEMPORARY_CLOCK_IN.equals(clockType);
-        // 上班卡必需有促销计划ID
-        if (isClockIn && (Objects.isNull(clockVo.getPlanId()) || clockVo.getPlanId() <= 0)) {
+        // 上班卡必需有店铺id
+        if (isClockIn && (Objects.isNull(clockVo.getStoreId()) || clockVo.getStoreId() <= 0)) {
             throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR, null);
         }
         // 非上班卡必需有打卡记录ID
@@ -72,10 +72,44 @@ public class TemporaryActivityClockCoreController {
         } else if (ClockType.TEMPORARY_CLOCK_OUT.equals(clockType)) {
             builderClockOutData(clockVo, dto, clockTime);
         }
-//        tempActivityClockCoreService.clockInTodayActivity(dto, clockType);
-        tempActivityClockCoreService.clockInTodayPlan(dto, clockType);
+        tempActivityClockCoreService.clockInTodayActivity(dto, clockType);
         return R.success();
     }
+//    @PostMapping("/today/clock")
+//    public R clockInTodayActivity(@RequestBody TemporaryClockVo clockVo) {
+//        clockVo.validate();
+//        Integer clockType = clockVo.getClockType();
+//        boolean isClockIn = ClockType.TEMPORARY_CLOCK_IN.equals(clockType);
+//        // 上班卡必需有促销计划ID
+//        if (isClockIn && (Objects.isNull(clockVo.getPlanId()) || clockVo.getPlanId() <= 0)) {
+//            throw new ParamException(RCode.NOT_CLOCK_STORE_ERROR, null);
+//        }
+//        // 非上班卡必需有打卡记录ID
+//        if (!isClockIn && Objects.isNull((clockVo.getId()))) {
+//            throw new ParamException(RCode.CLOCK_DETAIL_ERROR, null);
+//        }
+//
+//        // 根据打卡经纬度判断与打卡店铺的距离，距离超过100米不能打卡
+////        tempActivityClockCoreService.clockStoreCalDistance(clockVo.getStoreQcId(),clockVo.getId(),clockVo.getClockCoordinates());
+//
+//        // 限制重复提交
+//        repetitiveClock(clockVo);
+//
+//        Date clockTime = new Date();
+//        TemporaryClockDto dto = new TemporaryClockDto(clockVo.getClockType(), clockVo.getId(), clockVo.getTemporaryId(), clockVo.getTemporaryName(), clockVo.getClockProvince(), clockVo.getClockCity());
+//        // 上班卡、午休下班卡、午休上班卡、下班卡
+//        if (isClockIn) {
+//            builderClockInData(clockVo, dto, clockTime);
+//        } else if (ClockType.TEMPORARY_NOON_CLOCK_OUT.equals(clockType)) {
+//            builderNoonClockOutData(clockVo, dto, clockTime);
+//        } else if (ClockType.TEMPORARY_NOON_CLOCK_IN.equals(clockType)) {
+//            builderNoonClockInData(clockVo, dto, clockTime);
+//        } else if (ClockType.TEMPORARY_CLOCK_OUT.equals(clockType)) {
+//            builderClockOutData(clockVo, dto, clockTime);
+//        }
+//        tempActivityClockCoreService.clockInTodayPlan(dto, clockType);
+//        return R.success();
+//    }
 
     /**
      * 打卡照片更换
@@ -118,8 +152,8 @@ public class TemporaryActivityClockCoreController {
     // 上班打卡
     private void builderClockInData(TemporaryClockVo clockVo, TemporaryClockDto clockDto, Date dateTime) {
         clockDto.setPlanId(clockVo.getPlanId())
-//                .setStoreId(clockVo.getStoreId())
-//                .setStoreName(clockVo.getStoreName())
+                .setStoreId(clockVo.getStoreId())
+                .setStoreName(clockVo.getStoreName())
                 .setClockInAddress(clockVo.getClockAddress())
                 .setClockInCoordinates(clockVo.getClockCoordinates())
                 .setClockInPhoto(clockVo.getClockPhoto())

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityClockCoreServiceImpl.java

@@ -63,27 +63,27 @@ public class TemporaryActivityClockCoreServiceImpl implements TemporaryActivityC
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void clockInTodayActivity(TemporaryClockDto dto, Integer clockType) {
-//        if (Objects.isNull(dto.getId())) {
-//            // 补充信息
-//            EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());
-//            ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfoDto.getEmployeeId());
-//
-//            dto.setLineName(planInfoDto.getLineName())
-//                    .setDeptQcId(employeeDto.getDeptQcId())
-//                    .setDeptQcOrgName(employeeDto.getDeptQcName())
-//                    .setChargerQcId(employeeDto.getQcId())
-//                    .setChargerName(employeeDto.getName())
-//                    .setActivityPatternId(planInfoDto.getActivityPatternId())
-//                    .setActivityPattern(planInfoDto.getActivityPattern())
-//                    .setDealerName(planInfoDto.getDealerName())
-//                    .setQinceStoreCode(planInfoDto.getQinceStoreCode());
-//            temporaryActivityClockDao.save(dto);
-//        } else {
-//            temporaryActivityClockDao.updateById(dto);
-//        }
-//        // 根据ID保存图片
-//        saveClockPhoto(dto, clockType);
-//        // 日志保存
+        if (Objects.isNull(dto.getId())) {
+            // 补充信息
+            EmployeeActivityPlanInfoDto planInfoDto = employeeActivityPlanInfoDao.selectById(dto.getStoreId());
+            ManageEmployeeInfoDto employeeDto = manageEmployeeInfoDao.selectById(planInfoDto.getEmployeeId());
+
+            dto.setLineName(planInfoDto.getLineName())
+                    .setDeptQcId(employeeDto.getDeptQcId())
+                    .setDeptQcOrgName(employeeDto.getDeptQcName())
+                    .setChargerId(employeeDto.getId())
+                    .setChargerName(employeeDto.getName())
+                    .setActivityPatternId(planInfoDto.getActivityPatternId())
+                    .setActivityPattern(planInfoDto.getActivityPattern())
+                    .setDealerName(planInfoDto.getDealerName())
+                    .setQinceStoreCode(planInfoDto.getQinceStoreCode());
+            temporaryActivityClockDao.save(dto);
+        } else {
+            temporaryActivityClockDao.updateById(dto);
+        }
+        // 根据ID保存图片
+        saveClockPhoto(dto, clockType);
+        // 日志保存
 //        tempActivityLogDao.save(dto.getTemporaryId(), dto.getTemporaryName(), LogType.t_1, dto.getId(), dto);
     }