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

Merge #81 into master from cc_20260320_standard_expense_Type

Browse Source 
feat：时间调整

* cc_20260320_standard_expense_Type: (40 commits squashed)

  - feat：费用类型新增

  - feat：费用类型

  - feat：默认数据

  - feat：类型调整

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：逻辑调整

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：逻辑调整-标准店

  - feat：查询预分账调整

  - feat：查询预分账调整

  - feat：心愿单 校验调整

  - feat：心愿单 校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：心愿单 金额校验调整

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送

  - feat：先推送账单 再推送 优化推送 当系统使用费为零的时候 推送数据重置的问题

  - Merge branch 'master' into cc_20260320_standard_expense_Type

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：接口新增字段

  - feat：数据调整

  - feat：新增系统服务费

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - feat：新增系统服务费 319

  - feat：时间调整

  - feat：时间调整

  - feat：时间调整

  - feat：时间调整

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/81
This commit is contained in:
正新
2026-03-30 13:20:15 +00:00
parent d03bdb7cb0
commit 310ae0be7d
50 changed files with 1606 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
coolstore-partner-model/src/main/java/com/cool/store/dto/fees/ExpenseTypeAmountDTO.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.dto.fees;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Auther zx_szh
* @Date 2026/3/23 14:20
* @Version 1.0
*/
@Data
public class ExpenseTypeAmountDTO {
private BigDecimal totalAmount;
private String expenseType;
}

21
coolstore-partner-model/src/main/java/com/cool/store/dto/fees/WalletAllocationDTO.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.dto.fees;
import lombok.Data;
/**
* @Auther zx_szh
* @Date 2026/3/23 11:31
* @Version 1.0
*/
@Data
public class WalletAllocationDTO {
private Integer joinBrand;
private String expenseType;
private String payeeCode;
private String payeeName;
}

6
coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigItemDO.java
View File

@@ -39,6 +39,12 @@ public class ConfigItemDO implements Serializable {
@Column(name = "remark")
private String remark;
@Column(name = "expense_type_code")
private String expenseTypeCode;
@Column(name = "multiple_choice")
private Integer multipleChoice;
@Column(name = "created_user_id")
private String createdUserId;

3
coolstore-partner-model/src/main/java/com/cool/store/entity/config/ConfigOptionDO.java
View File

@@ -72,4 +72,7 @@ public class ConfigOptionDO implements Serializable {
@Column(name = "update_time")
private Date updateTime;
@Column(name = "expense_type_code")
private String expenseTypeCode;
}

3
coolstore-partner-model/src/main/java/com/cool/store/entity/order/StoreOrderOptionSnapshotDO.java
View File

@@ -77,4 +77,7 @@ public class StoreOrderOptionSnapshotDO {
@Column(name = "option_unit")
private String optionUnit;
@Column(name = "expense_type_code")
private String expenseTypeCode;
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/config/ConfigItemUpdateRequest.java
View File

@@ -35,4 +35,10 @@ public class ConfigItemUpdateRequest {
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("费用类型 字典表")
private String expenseTypeCode;
@ApiModelProperty("是否支持多选 1-是 2-否")
private Integer multipleChoice;
}

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

@@ -18,4 +18,6 @@ public class ConfigOptionQueryRequest extends PageBasicInfo {
@ApiModelProperty("选项名称(模糊)")
private String optionName;
private String expenseTypeCode;
}

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

@@ -54,4 +54,6 @@ public class ConfigOptionUpdateRequest {
private Integer sortOrder;
@ApiModelProperty("配置项选项明细")
private String optionRemark;
@ApiModelProperty("费用类型 字典表")
private String expenseTypeCode;
}

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

@@ -0,0 +1,26 @@
package com.cool.store.request.order;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Auther zx_szh
* @Date 2026/3/25 19:32
* @Version 1.0
*/
@Data
public class ChangeWishlistRequest {
@ApiModelProperty("门店ID")
private Long shopId;
@ApiModelProperty("订单ID")
private Long orderId;
@ApiModelProperty("心愿单ID")
private Long wishlistId;
}

9
coolstore-partner-model/src/main/java/com/cool/store/request/store/PreAllocationSaveRequest.java
View File

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;
@@ -21,9 +23,15 @@ public class PreAllocationSaveRequest {
@NotNull
@ApiModelProperty("门店ID")
Long shopId;
@ApiModelProperty("流程子阶段")
Integer subStage;
@Valid
List<PreAllocationItem> items;
@Data public static class PreAllocationItem{
private Long id;
@ApiModelProperty("缴费类型")
String expenseType;
@ApiModelProperty("公司名称")
@@ -32,6 +40,7 @@ public class PreAllocationSaveRequest {
String payeeCode;
@ApiModelProperty("分账金额")
@NotNull
@DecimalMin(value = "0.00", inclusive = true)
BigDecimal payAmount;
}
}

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

@@ -26,6 +26,8 @@ public class BatchTransferRequest {
private String payPwd;
private Integer verifyPassword;
private List<TransDataRequest> transArray;
@Data

12
coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.request.xgj;
import com.cool.store.entity.FranchiseFeeDO;
import com.cool.store.enums.FranchiseBrandEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
@@ -52,7 +53,7 @@ public class PushFranchiseFeeRequest {
private Integer joinBrand;
public PushFranchiseFeeRequest(){}
public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){
public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO,Integer joinBrand){
this.setShopId(shopId);
this.setPartnerName(partnerName);
this.setBillId(franchiseFeeDO.getId().intValue());
@@ -61,8 +62,8 @@ public class PushFranchiseFeeRequest {
this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee()));
this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee()));
this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond()));
// 三明治收银费
if (StringUtils.isNotBlank(franchiseFeeDO.getCashierFee())) {
// 三明治收银费 不为空 且不为零的时候
if (FranchiseBrandEnum.ZXSMZ.getCode()==joinBrand) {
this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee()));
}
this.setTotalFee(this.getBond()
@@ -73,4 +74,9 @@ public class PushFranchiseFeeRequest {
this.setCreateTime(franchiseFeeDO.getCreateTime());
}
public static void main(String[] args) {
BigDecimal bigDecimal = new BigDecimal(0.00);
}
}

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

@@ -16,6 +16,8 @@ public class ConfigItemVO {
private Integer sortNo;
private Integer status;
private String remark;
private String expenseTypeCode;
private Integer multipleChoice;
private String createdUserId;
private Date createdTime;
private String updatedUserId;

1
coolstore-partner-model/src/main/java/com/cool/store/vo/config/ConfigOptionVO.java
View File

@@ -23,4 +23,5 @@ public class ConfigOptionVO {
private String optionRemark;
private Date createTime;
private Date updateTime;
private String expenseTypeCode;
}

5
coolstore-partner-model/src/main/java/com/cool/store/vo/order/MiniStoreOrderDetailVO.java
View File

@@ -179,5 +179,10 @@ public class MiniStoreOrderDetailVO {
@ApiModelProperty("图片")
private String imageUrl;
@ApiModelProperty("费用类型code")
private String expenseTypeCode;
private BigDecimal defaultQuantity;
}
}