fix:十二分制-积分流水

This commit is contained in:
wangff
2025-11-10 15:12:19 +08:00
parent bd64b33ebb
commit 85de65cda6
11 changed files with 344 additions and 8 deletions

View File

@@ -20,10 +20,6 @@ public class TpAppealApplyRequest {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("门店id")
@NotBlank(message = "门店id不能为空")
private String storeId;
@ApiModelProperty("是否为草稿 0否 1是")
@NotNull(message = "是否为草稿不能为空")
private Integer isDraft;

View File

@@ -0,0 +1,42 @@
package com.cool.store.request.tp;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* <p>
* 积分流水查询Request
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class TpScoreJournalQueryRequest extends PageBasicInfo {
@ApiModelProperty("门店名称或编码")
private String storeNameOrNum;
@ApiModelProperty("加盟品牌")
private Integer joinBrand;
@ApiModelProperty("加盟模式")
private Integer joinModel;
@ApiModelProperty("门店类型")
private Integer storeType;
@ApiModelProperty("开始发生日期")
private Date startDate;
@ApiModelProperty("结束发生日期")
private Date endDate;
@ApiModelProperty("来源单据0加分申请单 2处罚申请单")
private Integer applyType;
@ApiModelProperty("来源单号")
private String applyNo;
}

View File

@@ -0,0 +1,100 @@
package com.cool.store.vo.tp;
import com.cool.store.enums.JoinModeEnum;
import com.cool.store.enums.StoreTypeEnum;
import com.cool.store.enums.master.BrandTypeEnum;
import com.cool.store.enums.tp.TpFormTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Objects;
/**
* <p>
* 积分流水VO
* </p>
*
* @author wangff
* @since 2025/11/10
*/
@Data
public class TpScoreJournalVO {
@ApiModelProperty("流水号")
private String journalNo;
@ApiModelProperty("门店编码")
private String storeNum;
@ApiModelProperty("加盟品牌")
private Integer joinBrand;
@ApiModelProperty("加盟品牌名称")
private String joinBrandName;
@ApiModelProperty("加盟模式")
private Integer joinModel;
@ApiModelProperty("加盟模式名称")
private String joinModelName;
@ApiModelProperty("门店类型")
private Integer storeType;
@ApiModelProperty("门店类型名称")
private String storeTypeName;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("发生分值")
private String occurScore;
@ApiModelProperty("发生日期")
private Date occurDate;
@ApiModelProperty("发生前分值")
private BigDecimal occurBeforeScore;
@ApiModelProperty("发生后分值")
private BigDecimal occurAfterScore;
@ApiModelProperty("单据类型")
private Integer applyType;
@ApiModelProperty("单据类型名称")
private String applyTypeName;
@ApiModelProperty("来源单号")
private String applyNo;
@ApiModelProperty("项目大类")
private String projectCategory;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("规则编码")
private String ruleNo;
@ApiModelProperty("创建时间")
private Date createTime;
public String getJoinBrandName() {
return BrandTypeEnum.getDescByCode(this.joinBrand);
}
public String getJoinModelNam() {
return JoinModeEnum.getDescByCode(this.joinModel);
}
public String getStoreTypeName() {
return StoreTypeEnum.getMessage(this.storeType);
}
public String getApplyTypeName() {
TpFormTypeEnum type = TpFormTypeEnum.getByType(this.applyType);
return Objects.nonNull(type) ? type.getAlias() : null;
}
}