Merge remote-tracking branch 'origin/cc_20250620_pre_fly' into cc_20250620_pre_fly

coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java

@@ -1,7 +1,10 @@
 package com.cool.store.dao;
 
+import com.cool.store.mapper.PreFryRecordsMapper;
 import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
+
 /**
  * @Author suzhuhong
  * @Date 2025/6/20 19:13
@@ -10,6 +13,12 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class PreFryRecordsDAO {
 
+    @Resource
+    private PreFryRecordsMapper preFryRecordsMapper;
+
+
+
+
 
 
 

coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryStageChangesDAO.java

@@ -1,7 +1,10 @@
 package com.cool.store.dao;
 
+import com.cool.store.mapper.PreFryStageChangesMapper;
 import org.springframework.stereotype.Repository;
 
+import javax.annotation.Resource;
+
 /**
  * @Author suzhuhong
  * @Date 2025/6/20 19:13
@@ -9,4 +12,19 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class PreFryStageChangesDAO {
+
+    @Resource
+    PreFryStageChangesMapper preFryStageChangesMapper;
+
+
+
+
+
+
+
+
+
+
+
+
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java

@@ -3,9 +3,12 @@ package com.cool.store.mapper;
 import com.cool.store.entity.PreFryRecordsDO;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface PreFryRecordsMapper extends Mapper<PreFryRecordsDO> {
 
 
+    int batchInsert(List<PreFryRecordsDO> records);
 
 
 

coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryStageChangesMapper.java

@@ -4,4 +4,11 @@ import com.cool.store.entity.PreFryStageChangesDO;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface PreFryStageChangesMapper extends Mapper<PreFryStageChangesDO> {
+
+
+
+
+
+
+
 }

coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml

@@ -13,7 +13,21 @@
     <result column="fry_complete_time" jdbcType="TIMESTAMP" property="fryCompleteTime" />
     <result column="latest_sale_time" jdbcType="TIMESTAMP" property="latestSaleTime" />
     <result column="current_stage" jdbcType="TINYINT" property="currentStage" />
+    <result column="current_apply_type" jdbcType="TINYINT" property="currentApplyType" />
     <result column="created_time" jdbcType="TIMESTAMP" property="createdTime" />
     <result column="updated_time" jdbcType="TIMESTAMP" property="updatedTime" />
   </resultMap>
+
+
+  <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+    INSERT INTO xfsg_pre_fry_records
+    (store_code, product_code, product_name, fry_date, fry_complete_time,
+    latest_sale_time, current_stage, current_apply_type, created_time, updated_time)
+    VALUES
+    <foreach collection="list" item="item" separator=",">
+      (#{item.storeCode}, #{item.productCode}, #{item.productName}, #{item.fryDate},
+      #{item.fryCompleteTime}, #{item.latestSaleTime}, #{item.currentStage},#{item.currentApplyType},
+      NOW(), NOW())
+    </foreach>
+  </insert>
 </mapper>

coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyDTO.java

@@ -14,25 +14,25 @@ import javax.validation.constraints.Min;
  */
 @Data
 public class ApplyDTO {
-    @ApiModelProperty(name = "从新提交时需要带上ID")
+    @ApiModelProperty("从新提交时需要带上ID")
     private Long id;
 
     private String storeCode;
 
-    @ApiModelProperty(name = "申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜")
+    @ApiModelProperty("申请类型：1-有冷藏展示柜，2-有常温展示柜，3-无展示柜")
     @Max(3)@Min(1)
     private Integer applyType;
 
-    @ApiModelProperty(name = "展示柜照片URL")
+    @ApiModelProperty("展示柜照片URL")
     private String refrigeratorPhoto;
 
-    @ApiModelProperty(name = "展示柜铭牌图片URL")
+    @ApiModelProperty("展示柜铭牌图片URL")
     private String refrigeratorPlatePhoto;
 
-    @ApiModelProperty(name = "(防绳罩、防尘罩)图片URL")
+    @ApiModelProperty("(防绳罩、防尘罩)图片URL")
     private String protectiveCoverPhoto;
 
-    @ApiModelProperty(name = "冷藏盒图片URL")
+    @ApiModelProperty("冷藏盒图片URL")
     private String coldStorageBoxPhoto;
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/pre/fry/ApplyDetailDTO.java

@@ -11,16 +11,16 @@ import lombok.Data;
 @Data
 public class ApplyDetailDTO extends ApplyManagementDTO{
 
-    @ApiModelProperty(name = "展示柜照片URL")
+    @ApiModelProperty( "展示柜照片URL")
     private String refrigeratorPhoto;
 
-    @ApiModelProperty(name = "展示柜铭牌图片URL")
+    @ApiModelProperty( "展示柜铭牌图片URL")
     private String refrigeratorPlatePhoto;
 
-    @ApiModelProperty(name = "(防绳罩、防尘罩)图片URL")
+    @ApiModelProperty( "(防绳罩、防尘罩)图片URL")
     private String protectiveCoverPhoto;
 
-    @ApiModelProperty(name = "冷藏盒图片URL")
+    @ApiModelProperty( "冷藏盒图片URL")
     private String coldStorageBoxPhoto;