1、促销员打卡时门店默认上一次的打卡门店；2、促销员上门照片去掉POS机凭证照片；3、审批校验删除对pos机凭证的校验；4、管理……

pom.xml

@@ -13,7 +13,7 @@
     <groupId>com.wangxiaolu</groupId>
     <artifactId>wangxiaolu-promotion-service</artifactId>
 
-    <version>0.1.7</version>
+    <version>0.1.8</version>
 
     <name>wangxiaolu-promotion-service</name>
     <description>promotion-service</description>
@@ -225,7 +225,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
-            <version>${spring-cloud-gateway.version}</version>
+<!--            <version>${spring-cloud-gateway.version}</version>-->
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-web</artifactId>
@@ -237,7 +237,7 @@
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
-            <version>${java-uuid-generator.version}</version>
+            <version>3.1.4</version>
         </dependency>
 
     </dependencies>

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

@@ -68,4 +68,18 @@ public class TemporaryActivityClockQueryController {
         TemporaryClockDto clockDto = temporaryActivityClockQueryService.findById(id);
         return R.success(clockDto);
     }
+
+    /**
+     * 根据促销员id查询上次打卡信息
+     */
+    @GetMapping("/latest")
+    public R findLatestClockInfo(Integer temporaryId){
+        if (Objects.isNull(temporaryId)){
+            return R.success();
+        }
+        TemporaryClockDto clockDto = temporaryActivityClockQueryService.findLatestClockByTemporaryId(temporaryId);
+        return R.success(clockDto);
+    }
+
+
 }

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

@@ -95,13 +95,17 @@ public class TemporaryActivityQueryController {
             throw new DataException(RCode.NOT_TGHD_PHOTO_ERROR);
         }else if (CollectionUtils.isEmpty(activityReportedDto.getTgcjPhotoUrls()) || activityReportedDto.getTgcjPhotoUrls().size() < 4){
             throw new DataException(RCode.NOT_TGCJ_PHOTO_ERROR);
-        }else if (CollectionUtils.isEmpty(activityReportedDto.getPsvPhotoUrls())){
-            throw new DataException(RCode.NOT_POS_PHOTO_ERROR);
         }
+
+//        else if (CollectionUtils.isEmpty(activityReportedDto.getPsvPhotoUrls())){
+//            throw new DataException(RCode.NOT_POS_PHOTO_ERROR);
+//        }
+
 //        List<TemporaryActivityMarketCellDto> marketCells = temporaryActivityQueryService.findActivityMarketCellByDb(activityId);
 //        if (CollectionUtils.isEmpty(marketCells)){
 //            throw new DataException(RCode.NOT_MARKET_CELL_ERROR);
 //        }
+
         return R.success();
     }
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/TemporaryActivityClockDao.java

@@ -39,4 +39,6 @@ public interface TemporaryActivityClockDao {
      * 员工查询负责的促销员打卡信息（分页查询）
      */
     void employeePage(String employeeQcId, PageInfo pageInfo,TemporaryClockWrapper tcw);
+
+    TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId);
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityClockDaoImpl.java

@@ -102,6 +102,12 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
         pageInfo.setTotalRecord(total);
     }
 
+    @Override
+    public TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId) {
+        TemporaryActivityClockDO clockDO = temporaryActivityClockMapper.findLatestClockByTemporaryId(temporaryId);
+        return transitionDto(clockDO);
+    }
+
     private LambdaQueryWrapper<TemporaryActivityClockDO> buildWrapper(TemporaryClockWrapper tcw) {
         LambdaQueryWrapper<TemporaryActivityClockDO> qw = new LambdaQueryWrapper<>();
         if (Objects.nonNull(tcw.getId())) {

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/TemporaryActivityClockMapper.java

@@ -22,6 +22,8 @@ public interface TemporaryActivityClockMapper extends BaseMapper<TemporaryActivi
     List<TemporaryActivityClockDO> employeePageFirsd(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize, @Param("skipNum") int skipNum, @Param("tcw") TemporaryClockWrapper tcw);
 
     Integer employeePageCount(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize);
+
+    TemporaryActivityClockDO findLatestClockByTemporaryId(Integer temporaryId);
 }
 
 

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/TemporaryActivityClockQueryService.java

@@ -13,4 +13,6 @@ public interface TemporaryActivityClockQueryService {
     TemporaryClockDto findTemporaryClockByTemIdAndDate(Integer temporaryId, String createDate);
 
     TemporaryClockDto findById(Long id);
+
+    TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId);
 }

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

@@ -61,6 +61,11 @@ public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivity
         return temporaryClockDto;
     }
 
+    @Override
+    public TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId) {
+        return temporaryActivityClockDao.findLatestClockByTemporaryId(temporaryId);
+    }
+
     /**
      * 查询打卡图片
      */

src/main/resources/mapper/TemporaryActivityClockMapper.xml

@@ -69,4 +69,10 @@
         from temporary_activity_clock)
     </select>
 
+    <select id="findLatestClockByTemporaryId" resultMap="BaseResultMap">
+        select store_id, store_name,activity_pattern_id,activity_pattern
+        from temporary_activity_clock
+        where id = (select max(id) from temporary_activity_clock where temporary_id = #{temporaryId} and is_delete = 1);
+    </select>
+
 </mapper>