diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java index 5ec738a66..620aa5236 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java @@ -76,7 +76,7 @@ public class BalanceDetailsRespVO { @Schema(description = "支出/入账赠送金金额") - private BigDecimal bonusAmountChange; + private BigDecimal giftAmountChange; } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsRespVO.java index 788ee04e8..8246b72fd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsRespVO.java @@ -1,7 +1,6 @@ package com.cf.imes.module.system.controller.admin.funds.products.vo.productDetails; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import com.cf.imes.module.system.validation.products.ProductType; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,25 +15,29 @@ import java.time.LocalDateTime; public class ProductDetailsRespVO { @Schema(description = "产品详情id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10725") - @ExcelProperty("产品详情id") private Long id; @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("产品ID") private String productId; @Schema(description = "购买方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "购买方式:0时长;1产量") @ProductType private Integer purchaseType; - @Schema(description = "正常时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "半个月") + @Schema(description = "购买时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String duration; + @Schema(description = "产品时长单位,0:年、1:月、2:日", example = "1") + private Integer durationUnit; + @Schema(description = "正常产量", requiredMode = Schema.RequiredMode.REQUIRED, example = "") private BigDecimal output; - @Schema(description = "赠送时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "半个月") - private String giftDuration; + @Schema(description = "赠送时长", example = "1") + private Integer giftDuration; + + @Schema(description = "赠送时长单位,0:年、1:月、2:日", example = "1") + private Integer giftDurationUnit; @Schema(description = "赠送产量", requiredMode = Schema.RequiredMode.REQUIRED, example = "") private BigDecimal giftOutput; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java index 26037bd92..e3fee370e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java @@ -38,12 +38,12 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { // 根据收支类型赋值对应的 支出/收入字段 result.getList().forEach(f -> { - if (f.getIncomeExpenseType().equals(IncomeExpenseTypeEnum.INCOME.getType())) { + if (IncomeExpenseTypeEnum.INCOME.getType().equals(f.getIncomeExpenseType())) { f.setEntryAmount(f.getCashAmountChange()); - f.setEntryGiftAmount(f.getBonusAmountChange()); + f.setEntryGiftAmount(f.getGiftAmountChange()); } else { f.setExpensesAmount(f.getCashAmountChange()); - f.setExpensesGiftAmount(f.getBonusAmountChange()); + f.setExpensesGiftAmount(f.getGiftAmountChange()); } }); return result; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index b8de1e42a..feac2e4fd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -31,6 +31,7 @@ import com.cf.imes.module.system.controller.admin.tokenconfig.vo.JwtConfig; import com.cf.imes.module.system.controller.admin.user.vo.user.UserSaveReqVO; import com.cf.imes.module.system.convert.organ.OrganConvert; import com.cf.imes.module.system.dal.dataobject.dict.DictDataDO; +import com.cf.imes.module.system.dal.dataobject.funds.organamount.OrganAmountDO; import com.cf.imes.module.system.dal.dataobject.lable.LabelDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO; @@ -42,6 +43,7 @@ import com.cf.imes.module.system.dal.dataobject.permission.RoleDO; import com.cf.imes.module.system.dal.dataobject.systemconfig.*; import com.cf.imes.module.system.dal.dataobject.tokenconfig.TokenConfigDO; import com.cf.imes.module.system.dal.mysql.dict.DictDataMapper; +import com.cf.imes.module.system.dal.mysql.funds.organamount.OrganAmountMapper; import com.cf.imes.module.system.dal.mysql.label.LabelMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineLimitMapper; import com.cf.imes.module.system.dal.mysql.machine.MachineMapper; @@ -150,6 +152,9 @@ public class OrganServiceImpl implements OrganService { @Resource private LabelMapper labelMapper; + @Resource + private OrganAmountMapper organAmountMapper; + @Override public List getOrganIdList() { @@ -240,6 +245,11 @@ public class OrganServiceImpl implements OrganService { // 复制系统配置里的相关配置 copySystemConfig(tenant.getId()); + // 创建组织套餐 + organAmountMapper.insert(OrganAmountDO.builder() + .organId(tenant.getId()) + .build()); + return tenant.getId(); }