促销模板4.0新增午休/试吃/品类

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -61,8 +61,10 @@ public class PromPlanCoreController {
         try {
             String[] urlArr = activityPlanVo.getExcelUrl().split("/");
             String fileId = urlArr[urlArr.length - 1];
-            String filePath = "/root/promotion/planv2/" + fileId;
-            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//todo            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//             todo
+            String filePath = activityPlanVo.getExcelUrl();
             activityPlanVo.setExcelId(fileId);
             Map<String, Object> map = promPlanCoreService.selfPlanUp(activityPlanVo, filePath);
             return R.success(map);
@@ -96,8 +98,10 @@ public class PromPlanCoreController {
         try {
             String[] urlArr = activityPlanVo.getExcelUrl().split("/");
             String fileId = urlArr[urlArr.length - 1];
-            String filePath = "/root/promotion/planv2/" + fileId;
-            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//todo            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//            todo
+            String filePath = activityPlanVo.getExcelUrl();
             activityPlanVo.setExcelId(fileId);
             Map<String, Object> map = promPlanCoreService.authPlanUp(activityPlanVo, filePath);
             return R.success(map);
@@ -139,8 +143,10 @@ public class PromPlanCoreController {
         try {
             String[] urlArr = activityPlanVo.getExcelUrl().split("/");
             String fileId = urlArr[urlArr.length - 1];
-            String filePath = "/root/promotion/planv2/" + fileId;
-            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//todo            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//            todo
+            String filePath = activityPlanVo.getExcelUrl();
             activityPlanVo.setExcelId(fileId);
             Map<String, Object> map = promPlanCoreService.selfPlanPut(activityPlanVo, filePath);
             return R.success(map);

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/ActivityPlanRecordDao.java

 package com.wangxiaolu.promotion.domain.activityplanv2.dao;
 
 import com.alibaba.fastjson.JSONObject;
+import com.wangxiaolu.promotion.enums.plan.OperationType;
 
 /**
  * @author : liqiulin
@@ -8,5 +9,5 @@ import com.alibaba.fastjson.JSONObject;
  * @describe :
  */
 public interface ActivityPlanRecordDao {
-    Long save(JSONObject record);
+    Long save(JSONObject record, OperationType operationType);
 }

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -69,7 +69,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
 
     @Override
     public void updateById(ActivityPlanInfoDto planDto) {
-        // todo 判断计划是否存在
+        // 判断计划是否存在
 //        ActivityPlanInfoDo activityPlanInfoDo = activityPlanInfoMapper.selectPlan(planDto.getStoreCode(), planDto.getDate());
 //        if (Objects.isNull(activityPlanInfoDo)){
 //            throw new DataException(RCode.ACTIVITY_PLAN_IS_NULL);

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanRecordDaoImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.wangxiaolu.promotion.domain.activityplanv2.dao.ActivityPlanRecordDao;
 import com.wangxiaolu.promotion.domain.activityplanv2.mapper.ActivityPlanRecordMapper;
 import com.wangxiaolu.promotion.domain.activityplanv2.mapper.entity.ActivityPlanRecordDo;
+import com.wangxiaolu.promotion.enums.plan.OperationType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -19,8 +20,9 @@ public class ActivityPlanRecordDaoImpl implements ActivityPlanRecordDao {
     private ActivityPlanRecordMapper activityPlanRecordMapper;
 
     @Override
-    public Long save(JSONObject record) {
+    public Long save(JSONObject record,OperationType operationType) {
         ActivityPlanRecordDo activityPlanRecordDo = JSONObject.parseObject(record.toJSONString(), ActivityPlanRecordDo.class);
+        activityPlanRecordDo.setOperationType(operationType);
         activityPlanRecordMapper.insert(activityPlanRecordDo);
         return activityPlanRecordDo.getId();
     }

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/mapper/entity/ActivityPlanInfoDo.java

@@ -133,6 +133,15 @@ public class ActivityPlanInfoDo implements Serializable {
      */
     private LocalDateTime clockInTime;
 
+    /**
+     * 午休下班时间
+     */
+    private LocalDateTime noonOutLocalTime;
+    /**
+     * 午休上班时间
+     */
+    private LocalDateTime noonInLocalTime;
+
     /**
      * 下班时间
      */
@@ -141,12 +150,21 @@ public class ActivityPlanInfoDo implements Serializable {
     /**
      * 工资
      */
-    private BigDecimal salary;
+//    private BigDecimal salary;
 
     /**
      * 杂费
      */
-    private BigDecimal incidentals;
+//    private BigDecimal incidentals;
+
+    /**
+     * 是否有试吃台
+     */
+    private String temWlSct;
+    /**
+     * 活动品项：老品/黑鸭/散称
+     */
+    private String prdClass;
 
     /**
      * 是否执行：1:执行；0：未执行；

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/mapper/entity/ActivityPlanRecordDo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import com.wangxiaolu.promotion.enums.plan.OperationType;
 import lombok.Data;
 
 /**
@@ -46,16 +48,13 @@ public class ActivityPlanRecordDo implements Serializable {
      */
     private String excelFiledId;
 
+    private OperationType operationType;
+
     /**
      * 创建时间
      */
     private Date createTime;
 
-    /**
-     * 修改时间
-     */
-    private Date modifyTime;
-
     /**
      * 1:有效；0：删除；
      */

src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/dto/ActivityPlanInfoDto.java

@@ -134,6 +134,14 @@ public class ActivityPlanInfoDto implements Serializable {
      * 上班时间
      */
     private LocalDateTime clockInTime;
+    /**
+     * 午休下班时间
+     */
+    private LocalDateTime noonOutLocalTime;
+    /**
+     * 午休上班时间
+     */
+    private LocalDateTime noonInLocalTime;
 
     /**
      * 下班时间
@@ -143,12 +151,20 @@ public class ActivityPlanInfoDto implements Serializable {
     /**
      * 工资
      */
-    private BigDecimal salary;
+//    private BigDecimal salary;
 
     /**
      * 杂费
      */
-    private BigDecimal incidentals;
+//    private BigDecimal incidentals;
+    /**
+     * 是否有试吃台
+     */
+    private String temWlSct;
+    /**
+     * 活动品项：老品/黑鸭/散称
+     */
+    private String prdClass;
 
     /**
      * 是否执行：1:执行；0：未执行；

src/main/java/com/wangxiaolu/promotion/pojo/activity/planv2/vo/ActivityPlanOperVo.java

@@ -70,11 +70,11 @@ public class ActivityPlanOperVo {
     /**
      * 工资
      */
-    private BigDecimal salary;
+//    private BigDecimal salary;
 
     /**
      * 杂费
      */
-    private BigDecimal incidentals;
+//    private BigDecimal incidentals;
     private List<Long> planIds;
 }

src/main/resources/application-live.yml

-spring:
-
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.18:3306/promotion?autoReconnect=true
-    username: NvqGbJXH
-    password: D9Y@FR,84B*$MD^A36&m
-  redis:
-    port: 6379
-    host: 111.198.15.68
-    database: 1
-    password: QjL6H5nH
-
-  main:
-    web-application-type: reactive
-
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.0.2:8848
-        namespace: 5a4d4bfc-5297-4c6f-b475-0a6ae838d8d9
-        group: promotion
-
-logging:
-  config: classpath:logback-spring.xml
-
-async:
-  executor:
-    thread:
-      core_pool_size: 4
-      name:
-        prefix: promotion-
-
-wx:
-  miniapp:
-    configs:
-      - appid: wxac14dc7765484d7d
-        secret: e73b574380a822c942e03ea4dc67aaa1
-        token: #微信小程序消息服务器配置的token
-        aesKey: #微信小程序消息服务器配置的EncodingAESKey
-        msgDataFormat: JSON
-    temporary:
-      token_secret: sXwHPj#U#xmim^ts
-    employee:
-      token_secret: xZq%kXASSPD$UtL
-  cx_miniapp:
-    app_id: wxac14dc7765484d7d
-    app_secret: e73b574380a822c942e03ea4dc67aaa1
-tengxunyun:
-  #  腾讯云个人账号信息
-  secret_d: AKIDVt353sWyY0GXn0ANa0YyGdwDIBtjQwGS
-  secret_key: SBqJcrxypSxeGOPF81mLgsANXo3ALhz7
-  sms:
-    #指定接入地域域名，默认就近地域接入域名为 sms.tencentcloudapi.com
-    endpoint_beijing: sms.ap-beijing.tencentcloudapi.com
-    #地域信息
-    ap_beijing: ap-beijing
-    #应用ID（默认应用）
-    sdk_app_id_defult: 1400903035
-    #签名内容
-    sign_name_a: 北京王小卤
-    #模板ID
-    template_id_a: 2127434
-    #验证码过期时间（分钟）
-    overdue_long: 5
-
-qince:
-  open_api: https://openapi.region2.qince.com
-  open_id: 8546408787259919799
-  app_key: oV0FHfMt81Tii2_kst
-
-# mybatis-plus 打印sql日志
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-# xxl-job配置
-xxl:
-  job:
-    accessToken: default_token
-    admin:
-      addresses: http://192.168.0.2:9001/xxl-job-admin
-    executor:
-      appname: promotion-live
-      port: 9998
-      logretentiondays: 30
-      address:
-      ip: 192.168.0.4
-      logpath: /var/logs/xxl_job # 执行器日志路径
-
-
-aliyun:
-  access-key-id: LTAI5tEvDG8hMRf9tBt9kB3s
-  access-key-secret: TnH1qRJr95t62pNcVLNopeEhpPxiqe
-  oss:
-    region-id: cn-shanghai
-    sts-role-arm: acs:ram::1819206190412770:role/oss-admin-role
-    session-name: promotion-live-miniapp
-    bucket-name: link-promotion
-    web-js-link: link-promotion.oss-cn-shanghai.aliyuncs.com
\ No newline at end of file

src/main/resources/mapper/activityplanv2/ActivityPlanInfoMapper.xml

@@ -68,15 +68,15 @@
 
     <insert id="saveList">
         INSERT INTO activity_plan_info
-        (plan_file_id,employee_id,employee_name,employee_no,year,month,date,line_name,store_name,store_code,org_qc_id,org_name,pattern_id,pattern,dealer_id,dealer_name,both_t,province,city,area,addr,clock_in_time,clock_out_time,salary,incidentals,create_by)
+        (plan_file_id,employee_id,employee_name,employee_no,year,month,date,line_name,store_name,store_code,org_qc_id,org_name,pattern_id,pattern,dealer_id,dealer_name,both_t,province,city,area,addr,clock_in_time,clock_out_time,noon_clock_out_time,noon_clock_in_time,tem_wl_sct,prd_class,create_by)
         VALUES
         <foreach collection="table" item="item" index="index" separator=",">
             (#{recordId}, #{item.employeeId}, #{item.employeeName}, #{item.employeeNo}, #{item.year},
             #{item.month}, FROM_UNIXTIME(#{item.date} / 1000), #{item.lineName}, #{item.storeName}, #{item.storeCode},
             #{item.orgQcId},#{item.orgName}, 0, #{item.pattern}, #{item.dealerId}, #{item.dealerName}, '未确定',
             #{item.province}, #{item.city}, #{item.area}, #{item.addr},
-            FROM_UNIXTIME(#{item.clockInTime} / 1000), FROM_UNIXTIME(#{item.clockOutTime} / 1000), #{item.salary},
-            #{item.incidentals},#{item.createBy})
+            FROM_UNIXTIME(#{item.clockInTime} / 1000), FROM_UNIXTIME(#{item.clockOutTime} / 1000), FROM_UNIXTIME(#{item.noonOutLocalTime} / 1000),
+            FROM_UNIXTIME(#{item.noonInLocalTime} / 1000),#{item.temWlSct},#{item.prdClass},#{item.createBy})
         </foreach>
     </insert>
 
@@ -143,8 +143,10 @@
             dealer_name    = #{pDo.dealerName},
             clock_in_time  = #{pDo.clockInTime},
             clock_out_time = #{pDo.clockOutTime},
-            salary         = #{pDo.salary},
-            incidentals    = #{pDo.incidentals},
+            noon_clock_out_time = #{pDo.noonOutLocalTime},
+            noon_clock_in_time = #{pDo.noonInLocalTime},
+            tem_wl_sct = #{pDo.temWlSct},
+            prd_class = #{pDo.prdClass},
             modify_by    = #{pDo.modifyBy}
         where store_code = #{pDo.storeCode}
           and date = #{pDo.date};