suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into cc_20250905_storeExtendInfo

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
This commit is contained in:
wangff
2025-09-23 14:11:42 +08:00
parent 48fe55c8be 00aee8919d
commit eb53fe9d2d
38 changed files with 598 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-model/src/main/java/com/cool/store/dto/StoreDTO.java
View File

@@ -43,4 +43,13 @@ public class StoreDTO {
private String longitude;
private String latitude;
@ApiModelProperty("订货人")
private String addresseeName;
@ApiModelProperty("手机号")
private String addresseeMobile;
@ApiModelProperty("收件省市区")
private String addresseeArea;
@ApiModelProperty("订货地址")
private String addresseeAddress;
}

25
coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java Normal file
View File

@@ -0,0 +1,25 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* <p>
* 门店名称DTO
* </p>
*
* @author wangff
* @since 2025/9/16
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class StoreNameDTO {
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("门店编码")
private String storeNum;
}

8
coolstore-partner-model/src/main/java/com/cool/store/dto/notice/NoticeDTO.java
View File

@@ -75,4 +75,12 @@ public class NoticeDTO {
@ApiModelProperty("发布人时间")
private Date publishTime;
private String handlePersonInfo;
private String storeInfo;
private Integer jumpType;
private String jumpUrl;
}

8
coolstore-partner-model/src/main/java/com/cool/store/entity/MessageTemplateDO.java
View File

@@ -151,5 +151,13 @@ public class MessageTemplateDO {
@Column(name = "store_info")
private String storeInfo;
@Column(name = "jump_type")
private Integer jumpType;
@Column(name = "jump_url")
private String jumpUrl;
@Column(name = "handle_keyword")
private String handleKeyword;
}

23
coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
View File

@@ -238,5 +238,28 @@ public class StoreDO {
private String miniProgramOrderStoreName;
/**
* 是否接入物联网
*/
private Integer isIot;
/**
* 收件人
*/
private String addresseeName;
/**
* 手机号
*/
private String addresseeMobile;
/**
* 收件省市区
*/
private String addresseeArea;
/**
* 收件详细地址
*/
private String addresseeAddress;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java
View File

@@ -219,6 +219,8 @@ public class ZxjpApiRequest {
private Long shopId;
@ApiModelProperty("合同编号")
private String contractCode;

4
coolstore-partner-model/src/main/java/com/cool/store/request/notice/MatterConfigAddRequest.java
View File

@@ -28,13 +28,13 @@ public class MatterConfigAddRequest {
private String systemSource;
@ApiModelProperty( "1:H5 2:小程序")
private Boolean jumpType;
private Integer jumpType;
@ApiModelProperty( "跳转链接")
private String jumpUrl;
@ApiModelProperty( "状态(0:禁用 1:启用)")
private Boolean status;
private Integer status;
@ApiModelProperty( "备注")
private String remark;

26
coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdHandleMessageRequest.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.request.notice;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/8/29 11:10
* @Version 1.0
*/
@Data
public class ThirdHandleMessageRequest {
@ApiModelProperty("发起任务时 传的handleKeyword")
@NotBlank(message = "handleKeyword不能为空")
private String handleKeyword;
@ApiModelProperty("门店编码列表")
@NotNull(message = "门店编码列表不能为空")
private List<String> shopCodeList;
}

66
coolstore-partner-model/src/main/java/com/cool/store/request/notice/ThirdMatterRequest.java Normal file
View File

@@ -0,0 +1,66 @@
package com.cool.store.request.notice;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/8/26 16:10
* @Version 1.0
*/
@Data
public class ThirdMatterRequest {
@ApiModelProperty("0-提交订单 5-已分配拣货 10-拣货完成 15-已出库 20-配送中 25-订单签收 30-服务包发布 35-补货 40-盘点通知 ")
@NotNull(message = "场景不能为空")
private Integer sceneCode;
@ApiModelProperty("事项配置ID CRM配置好部分信息 找CRM提供")
@NotNull(message = "事项配置ID不能为空")
private Long matterConfigId;
@ApiModelProperty("事项标题")
@NotBlank(message = "事项标题不能为空")
private String matterTitle;
@ApiModelProperty("处理类型(1:仅阅读 2:需要处理)")
@NotNull(message = "处理类型不能为空")
private Integer processType;
@ApiModelProperty("提醒类型(1:持续提醒 2:阶段提醒)")
@NotNull(message = "提醒类型不能为空")
private Integer remindType;
@ApiModelProperty("阶段提醒时 需要设置时间范围 开始时间")
private Date remindStartTime;
@ApiModelProperty("阶段提醒时 需要设置时间范围 结束时间")
private Date remindEndTime;
@ApiModelProperty("截止时间")
private Date deadline;
@ApiModelProperty("今日必办标识 0非必办 1必办")
@NotNull(message = "今日必办标识不能为空")
private Integer todayTask;
@ApiModelProperty("消息图片URL 物流crm自动匹配 无需传递")
private String messageImage;
@ApiModelProperty("门店范围 如果不传 默认取matterConfigId对应的门店范围 如果都没有 任务处于待发布状态")
List<String> shopCodeList;
@ApiModelProperty("手机号列表 如果不传 默认取matterConfigId配置的人员信息 如果都没有 任务处于待发布状态")
List<String> mobileList;
private String jumpUrl;
@ApiModelProperty("处理关键字 针对processType需要处理的字段 需要传递该关键字识别 注意 每个批次门店任务keyword不能重复")
private String handleKeyword;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageDetailVO.java
View File

@@ -39,5 +39,7 @@ public class MessageDetailVO {
private Integer processStatus;
private Integer processType;
@ApiModelProperty("第三方id")
private String handleKeyword;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/notice/MessageTemplateDetailVO.java
View File

@@ -51,6 +51,8 @@ public class MessageTemplateDetailVO {
private Integer totalNum;
@ApiModelProperty("系统来源")
private String systemSource;
@ApiModelProperty("第三方id")
private String handleKeyword;
}

10
coolstore-partner-model/src/main/java/com/cool/store/vo/notice/StoreMessageVO.java
View File

@@ -13,9 +13,11 @@ import java.util.Date;
@Data
public class StoreMessageVO {
private Long id;
@ApiModelProperty("模版COde")
@ApiModelProperty("模版Code")
private Integer moduleCode;
private Integer matterType;
@ApiModelProperty("模版ID")
private Long templateId;
@ApiModelProperty("已读状态")
@@ -33,4 +35,10 @@ public class StoreMessageVO {
@ApiModelProperty("今日必办")
private Integer todayTask;
private Integer jumpType;
private String jumpUrl;
private String resource;
}