Merge #119 into master from cc_20260508_open_store_req
门店新开店需求7&主数据需求2
* cc_20260508_open_store_req: (4 commits squashed)
- fix:未开业门店试营业日期
- fix:开业日期报备不同步门店状态
- fix:修改门店开业日期判断条件修改
- Merge branch 'master' into cc_20260508_open_store_req
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/119
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
package com.cool.store.dto.store;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 门店试营业日期DTO
|
||||
* </p>
|
||||
*
|
||||
* @author wangff
|
||||
* @since 2026/5/8
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class StoreExtendSoftOpenDTO {
|
||||
@ApiModelProperty("门店id")
|
||||
private String storeId;
|
||||
|
||||
@ApiModelProperty("开始试营业日期")
|
||||
private Date softOpenDate;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package com.cool.store.request.storeopen;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 门店未开通缺失日表请求
|
||||
*
|
||||
* @author wangff
|
||||
* @since 2026/5/8
|
||||
*/
|
||||
@Data
|
||||
public class StoreDailyNonOpenMissingRequest {
|
||||
@ApiModelProperty("单日查询,格式 yyyy-MM-dd")
|
||||
private String date;
|
||||
|
||||
@ApiModelProperty("范围开始日期,格式 yyyy-MM-dd")
|
||||
private String startDate;
|
||||
|
||||
@ApiModelProperty("范围结束日期,格式 yyyy-MM-dd")
|
||||
private String endDate;
|
||||
|
||||
@ApiModelProperty("单个门店编码")
|
||||
private String shopSn;
|
||||
|
||||
@ApiModelProperty("多个门店编码")
|
||||
private List<String> shopSns;
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.cool.store.response.storeopen;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 门店未开通缺失日表响应
|
||||
*
|
||||
* @author wangff
|
||||
* @since 2026/5/8
|
||||
*/
|
||||
@Data
|
||||
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||
public class StoreDailyNonOpenMissingResponse {
|
||||
/**
|
||||
* 数据日期,格式 yyyy-MM-dd
|
||||
*/
|
||||
private String date;
|
||||
|
||||
/**
|
||||
* 门店编码
|
||||
*/
|
||||
private String shopSn;
|
||||
|
||||
/**
|
||||
* CRM 门店状态
|
||||
*/
|
||||
private String crmStoreStatus;
|
||||
|
||||
/**
|
||||
* 当日金额
|
||||
*/
|
||||
private BigDecimal dailyAmount;
|
||||
|
||||
/**
|
||||
* 创建时间,格式 yyyy-MM-dd HH:mm:ss
|
||||
*/
|
||||
private String createdAt;
|
||||
|
||||
/**
|
||||
* 更新时间,格式 yyyy-MM-dd HH:mm:ss
|
||||
*/
|
||||
private String updatedAt;
|
||||
}
|
||||
Reference in New Issue
Block a user