Merge #32 into master from cc_20260113_open
开业日期报备
* cc_20260113_open: (15 commits squashed)
- feat:阶段调整
- feat:开业阶段调整
- feat:开业日期报备
- feat:开业日期报备代办
- feat:文本通知
- feat:数据处理
- fix:bug
- feat:通知功能
- Merge branch 'master' into cc_20260113_open
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
- feat:开业代办新增代办预计开业时间
- feat:开业时间查询
- feat:开业
- feat:PC计划开业时间
- Merge branch 'master' into cc_20260113_open
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
- Merge branch 'master' into cc_20260113_open
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java
Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/32
This commit is contained in:
@@ -0,0 +1,26 @@
|
||||
package com.cool.store.dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Auther zx_szh
|
||||
* @Date 2026/1/13 15:28
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class OpenInfoDTO {
|
||||
|
||||
@ApiModelProperty("门店ID")
|
||||
private Long shopId;
|
||||
|
||||
@ApiModelProperty("计划开业时间")
|
||||
private String planOpenDate;
|
||||
|
||||
@ApiModelProperty("实际开业时间")
|
||||
private String actualOpenDate;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.cool.store.dto.message;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Auther zx_szh
|
||||
* @Date 2026/1/13 18:40
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class SendTextMessageDTO {
|
||||
|
||||
/**
|
||||
* 钉钉的企业唯一ID
|
||||
*/
|
||||
private String corpId;
|
||||
|
||||
/**
|
||||
* 发送的人员ID集合
|
||||
*/
|
||||
private String userIds;
|
||||
|
||||
/**
|
||||
* 内容
|
||||
*/
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 微应用:micro_app; E应用-e_app; 钉钉:DINGDING; 企业微信:qw
|
||||
*/
|
||||
private String appType;
|
||||
|
||||
private JSONObject oaJson;
|
||||
|
||||
private String messageType;
|
||||
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 发送消息业务id标识
|
||||
*/
|
||||
private String outBusinessId;
|
||||
|
||||
|
||||
|
||||
public SendTextMessageDTO() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SendTextMessageDTO{" +
|
||||
"corpId='" + corpId + '\'' +
|
||||
", userIds='" + userIds + '\'' +
|
||||
", content='" + content + '\'' +
|
||||
", appType='" + appType + '\'' +
|
||||
", oaJson=" + oaJson +
|
||||
", messageType='" + messageType + '\'' +
|
||||
", title='" + title + '\'' +
|
||||
", outBusinessId='" + outBusinessId + '\'' +
|
||||
'}';
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -167,4 +167,10 @@ public class ShopInfoDO {
|
||||
|
||||
@Column(name = "operations_consultant")
|
||||
private String operationsConsultant;
|
||||
|
||||
@Column(name = "plan_open_date")
|
||||
private Date planOpenDate;
|
||||
|
||||
@Column(name = "actual_open_date")
|
||||
private Date actualOpenDate;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Auther zx_szh
|
||||
* @Date 2026/1/13 13:48
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class OpenDateReportRequest {
|
||||
|
||||
@ApiModelProperty("门店ID")
|
||||
private Long shopId;
|
||||
|
||||
@ApiModelProperty("开业日期")
|
||||
private Date openDate;
|
||||
|
||||
}
|
||||
@@ -65,4 +65,7 @@ public class PreparationCommonPendingVO {
|
||||
|
||||
@ApiModelProperty("招商所属大区名称")
|
||||
private String investRegionName;
|
||||
|
||||
@ApiModelProperty("预计开业时间")
|
||||
private String planOpenDate;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user