refactor(promotion-service): 统一temporaryId字段类型为Long

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

@@ -75,7 +75,7 @@ public class TemporaryActivityClockQueryController {
      * 根据促销员id查询上次打卡信息
      */
     @GetMapping("/latest")
-    public R findLatestClockInfo(Integer temporaryId){
+    public R findLatestClockInfo( Long temporaryId){
         if (Objects.isNull(temporaryId)){
             return R.success();
         }

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

@@ -115,7 +115,7 @@ public class TemporaryActivityCoreController {
      * 当促销员取消保存活动记录时，数据进行删除
      */
     @DeleteMapping("/today/reported/market_cell/del")
-    public R todayDeleteMarketCellReported(Integer temporaryId) {
+    public R todayDeleteMarketCellReported( Long temporaryId) {
         tempActivityCoreService.todayActivityDeleteMarketCellReported(temporaryId);
         return R.success();
     }

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

@@ -61,7 +61,7 @@ public class TemporaryActivityQueryController {
      * 数据暂存到redis中，当调用保存接口时再添加到数据库中
      */
     @GetMapping("/today/reported/market_cell")
-    public R todayActivityMarketCell(Integer temporaryId) {
+    public R todayActivityMarketCell( Long temporaryId) {
         return R.success(temporaryActivityQueryService.findActivityMarketCell(temporaryId));
     }
 

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

@@ -40,7 +40,7 @@ public interface TemporaryActivityClockDao {
      */
     void employeePage(String employeeQcId, PageInfo pageInfo,TemporaryClockWrapper tcw);
 
-    TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId);
+    TemporaryClockDto findLatestClockByTemporaryId( Long temporaryId);
 
     TemporaryClockDto findClockInfo(TemporaryClockWrapper wr);
 }

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

@@ -85,7 +85,7 @@ public class PromotionStoreDaoImpl implements PromotionStoreDao {
                         .setArea(jo.getString("store_mss_area"))
                         .setStreet(jo.getString("store_mss_street"))
                         .setAddress(jo.getString("store_addr"))
-                        .setTemporaryId(0)
+                        .setTemporaryId(0L)
                         .setTemporaryName("系统同步")
                         .setStoreManager(jo.getString("store_manager"))
                         .setStoreManagerWaiqin365Id(jo.getString("store_manager_waiqin365_id"));

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

@@ -95,7 +95,7 @@ public class TemporaryActivityClockDaoImpl implements TemporaryActivityClockDao
     }
 
     @Override
-    public TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId) {
+    public TemporaryClockDto findLatestClockByTemporaryId( Long temporaryId) {
         TemporaryActivityClockDO clockDO = temporaryActivityClockMapper.findLatestClockByTemporaryId(temporaryId);
         return transitionDto(clockDO);
     }

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

@@ -58,6 +58,8 @@ public class TemporaryActivityTaskClockDaoImpl implements TemporaryActivityTaskC
         TemporaryActivityTaskClockDO temporaryActivityTaskClockDO = temporaryActivityTaskClockMapper.selectOne(
                 new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
                 .eq(ObjectUtil.isNotEmpty(wrapper.getTemporaryId()),TemporaryActivityTaskClockDO::getTemporaryId, wrapper.getTemporaryId())
+                .eq(ObjectUtil.isNotEmpty(wrapper.getClockId()),TemporaryActivityTaskClockDO::getClockId, wrapper.getClockId())
+                .eq(ObjectUtil.isNotEmpty(wrapper.getReportId()),TemporaryActivityTaskClockDO::getReportedId, wrapper.getReportId())
                 .eq(ObjectUtil.isNotEmpty(wrapper.getTaskType()),TemporaryActivityTaskClockDO::getTaskType, wrapper.getTaskType())
                 .eq(ObjectUtil.isNotEmpty(wrapper.getIsDelete()),TemporaryActivityTaskClockDO::getIsDelete, wrapper.getIsDelete())
                 // 当天的数据

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

@@ -23,7 +23,7 @@ public interface TemporaryActivityClockMapper extends BaseMapper<TemporaryActivi
 
     Integer employeePageCount(@Param("employeeQcId") String employeeQcId, @Param("pageSize") int pageSize);
 
-    TemporaryActivityClockDO findLatestClockByTemporaryId(Integer temporaryId);
+    TemporaryActivityClockDO findLatestClockByTemporaryId( Long temporaryId);
 }
 
 

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/PromotionStoreDO.java

@@ -81,7 +81,7 @@ public class PromotionStoreDO implements Serializable {
     /**
      * 门店提交人id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * 门店提交人
@@ -140,4 +140,4 @@ public class PromotionStoreDO implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityClockDO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * 
+ *
  * @TableName temporary_activity_clock
  */
 @TableName(value ="temporary_activity_clock")
@@ -24,7 +24,7 @@ public class TemporaryActivityClockDO implements Serializable {
     /**
      * temporary_info表id
      */
-    private Integer temporaryId;
+    private Long temporaryId;
 
     /**
      * temporary_info表name
@@ -165,4 +165,4 @@ public class TemporaryActivityClockDO implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityMarketCellDO.java

@@ -9,7 +9,7 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * 
+ *
  * @TableName temporary_activity_market_cell
  */
 @TableName(value ="temporary_activity_market_cell")
@@ -24,7 +24,7 @@ public class TemporaryActivityMarketCellDO implements Serializable {
     /**
      * 关联—temporary_info表id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     private Long activityReportedId;
 
@@ -59,7 +59,7 @@ public class TemporaryActivityMarketCellDO implements Serializable {
     private Date createTime;
 
     /**
-     * 创建日期YYYY-MM-DD 
+     * 创建日期YYYY-MM-DD
      */
     private String createDate;
 
@@ -76,4 +76,4 @@ public class TemporaryActivityMarketCellDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/domain/activity/mapper/entity/TemporaryActivityReportedDO.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 
+ *
  * @TableName temporary_activity_reported
  */
 @TableName(value ="temporary_activity_reported")
@@ -25,7 +25,7 @@ public class TemporaryActivityReportedDO implements Serializable {
     /**
      * 关联—temporary_info表id
      */
-    private Integer temporaryId;
+    private Long temporaryId;
 
     /**
      * 关联—temporary_info表name
@@ -142,4 +142,4 @@ public class TemporaryActivityReportedDO implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryMarketCellWrapper.java

@@ -22,6 +22,6 @@ public class TemporaryMarketCellWrapper {
 
     private List<Long> activityIds;
 
-    private Integer temporaryId;
+    private Long temporaryId;
 
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/manage/vo/ClockVo.java

@@ -23,7 +23,7 @@ public class ClockVo {
     /**
      * temporaryId
      */
-    Integer temporaryId;
+     Long temporaryId;
 
     // 活动模式Id
     Integer activityPatternId;

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/PromotionStoreDto.java

@@ -78,7 +78,7 @@ public class PromotionStoreDto implements Serializable {
     /**
      * 门店提交人id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * 门店提交人
@@ -133,4 +133,4 @@ public class PromotionStoreDto implements Serializable {
             throw new ParamException(RCode.API_DATA_ERROR,null);
         }
     }
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityMarketCellDto.java

@@ -20,7 +20,7 @@ public class TemporaryActivityMarketCellDto {
     /**
      * 关联—temporary_info表id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     private Long activityReportedId;
 

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/res/TemporaryActivityTaskClockRes.java

@@ -27,7 +27,7 @@ public class TemporaryActivityTaskClockRes {
      */
     private Long clockId;
 
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * temporary_info表name

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryActivityDataVo.java

@@ -22,12 +22,12 @@ public class TemporaryActivityDataVo {
      * 促销员活动上报id
      * 关联ID：temporary_activity_reported表id
      */
-    Long activityReportedId;
+    private Long activityReportedId;
     /**
      * 促销员id
      * temporaryInfo表id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * 促销员姓名
@@ -66,4 +66,4 @@ public class TemporaryActivityDataVo {
      */
     private List<String> psvPhotoUrls;
     private List<String> psvChangePhotoUrls;
-}
\ No newline at end of file
+}

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryActivityMarketCellVo.java

@@ -24,7 +24,7 @@ public class TemporaryActivityMarketCellVo {
      * 促销员id
      * temporaryInfo表id
      */
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * market_cell 表id

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/TemporaryActivityTaskClockReq.java

@@ -31,7 +31,7 @@ public class TemporaryActivityTaskClockReq {
     private Long clockId;
 
     @NotNull(message = "促销员id不能为空")
-    private Integer temporaryId;
+    private  Long temporaryId;
 
     /**
      * temporary_info表name

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

@@ -16,7 +16,7 @@ public interface TemporaryActivityClockQueryService {
     TemporaryClockDto findById(Long id);
     TemporaryClockDto selectOne(TemporaryClockWrapper tcw);
 
-    TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId);
+    TemporaryClockDto findLatestClockByTemporaryId( Long temporaryId);
 
 
     TemporaryClockDto findClockInfo(TemporaryClockWrapper wr);

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

@@ -34,7 +34,7 @@ public interface TemporaryActivityCoreService {
     /**
      * 删除销售上报-出售单元 - 缓存
      */
-    void todayActivityDeleteMarketCellReported(Integer temporaryId);
+    void todayActivityDeleteMarketCellReported( Long temporaryId);
 
     /**
      * 修改/删除 单一出售单元

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

@@ -26,7 +26,7 @@ public interface TemporaryActivityQueryService {
 
     TemporaryActivityReportedDto findTemporaryActivityById(Long activityId);
 
-    JSONArray findActivityMarketCell(Integer temporaryId);
+    JSONArray findActivityMarketCell( Long temporaryId);
 
     List<TemporaryActivityMarketCellDto> findActivityMarketCellByDb(Long activityId);
 

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

@@ -79,7 +79,7 @@ public class TemporaryActivityClockQueryServiceImpl implements TemporaryActivity
     }
 
     @Override
-    public TemporaryClockDto findLatestClockByTemporaryId(Integer temporaryId) {
+    public TemporaryClockDto findLatestClockByTemporaryId( Long temporaryId) {
         return temporaryActivityClockDao.findLatestClockByTemporaryId(temporaryId);
     }
 

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

@@ -162,7 +162,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
     }
 
     @Override
-    public void todayActivityDeleteMarketCellReported(Integer temporaryId) {
+    public void todayActivityDeleteMarketCellReported( Long temporaryId) {
         String key = temMarketCellRedisKey(temporaryId);
         redisCache.removeKey(key);
     }
@@ -232,7 +232,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
         }
     }
 
-    private String temMarketCellRedisKey(Integer temporaryId) {
+    private String temMarketCellRedisKey( Long temporaryId) {
         return RedisKeys.TemporaryKeys.TEMPORARY_ACTIVITY_MARKET_CELL.getKey() + temporaryId + "_" + DateUtil.today();
     }
 
@@ -271,7 +271,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
     }
 
 //    private void saveActivityPhoto(TemporaryActivityReportedDto temActDto) {
-//        Integer temporaryId = temActDto.getTemporaryId();
+//         Long temporaryId = temActDto.getTemporaryId();
 //        Long reportedId = temActDto.getId();
 //        // 推广试吃照片
 //        if (!CollectionUtils.isEmpty(temActDto.getTgscPhotoUrls())) {

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

@@ -73,7 +73,7 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
     }
 
     @Override
-    public JSONArray findActivityMarketCell(Integer temporaryId) {
+    public JSONArray findActivityMarketCell( Long temporaryId) {
         /**
          * 将数据保存到redis中Generators
          */