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

Merge #90 into master from cc_20260407_bzj

Browse Source 
feat：时间处理

* cc_20260407_bzj: (3 commits squashed)

  - 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/90
This commit is contained in:
正新
2026-04-08 11:41:54 +00:00
parent 68cef4b83a
commit 77ca18b6fc
13 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,14 @@ public class StoreOrderDO {
@Column(name = "original_contract_deposit")
private BigDecimal originalContractDeposit;
/** 设备保证金快照 */
@Column(name = "device_deposit")
private BigDecimal deviceDeposit;
/** 原设备保证金快照 */
@Column(name = "original_device_deposit")
private BigDecimal originalDeviceDeposit;
@Column(name = "design_fee")
private BigDecimal designFee;

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

@@ -94,6 +94,14 @@ public class StoreTypeDO implements Serializable {
@Column(name = "original_contract_deposit")
private BigDecimal originalContractDeposit;
/** 设备保证金 */
@Column(name = "device_deposit")
private BigDecimal deviceDeposit;
/** 原设备保证金 */
@Column(name = "original_device_deposit")
private BigDecimal originalDeviceDeposit;
/** 系统设计费 */
@Column(name = "design_fee")
private BigDecimal designFee;

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

@@ -70,6 +70,12 @@ public class StoreTypeUpdateRequest {
@ApiModelProperty("原合同保证金")
private BigDecimal originalContractDeposit;
@ApiModelProperty("设备保证金")
private BigDecimal deviceDeposit;
@ApiModelProperty("原设备保证金")
private BigDecimal originalDeviceDeposit;
@ApiModelProperty("首次订货费用")
private BigDecimal firstOrderFee;

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

@@ -93,6 +93,9 @@ public class MiniStoreOrderDetailVO {
@ApiModelProperty("合同保证金")
private BigDecimal contractDeposit;
@ApiModelProperty("设备保证金")
private BigDecimal deviceDeposit;
@ApiModelProperty("首次订货费用")
private BigDecimal firstOrderFee;
@@ -120,6 +123,9 @@ public class MiniStoreOrderDetailVO {
@ApiModelProperty("原合同保证金")
private BigDecimal originalContractDeposit;
@ApiModelProperty("原设备保证金")
private BigDecimal originalDeviceDeposit;
@ApiModelProperty("原首次订货费用")
private BigDecimal originalFirstOrderFee;

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

@@ -96,6 +96,9 @@ public class MiniStoreWishlistDetailVO {
@ApiModelProperty("合同保证金")
private BigDecimal contractDeposit;
@ApiModelProperty("设备保证金")
private BigDecimal deviceDeposit;
@ApiModelProperty("首次订货费用")
private BigDecimal firstOrderFee;
@@ -123,6 +126,9 @@ public class MiniStoreWishlistDetailVO {
@ApiModelProperty("原合同保证金")
private BigDecimal originalContractDeposit;
@ApiModelProperty("原设备保证金")
private BigDecimal originalDeviceDeposit;
@ApiModelProperty("原首次订货费用")
private BigDecimal originalFirstOrderFee;

6
coolstore-partner-model/src/main/java/com/cool/store/vo/store/StoreTypeVO.java
View File

@@ -69,6 +69,12 @@ public class StoreTypeVO {
@ApiModelProperty("原合同保证金")
private BigDecimal originalContractDeposit;
@ApiModelProperty("设备保证金")
private BigDecimal deviceDeposit;
@ApiModelProperty("原设备保证金")
private BigDecimal originalDeviceDeposit;
@ApiModelProperty("系统设计费")
private BigDecimal designFee;