Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、新增创建组织自动创建组织套餐；2、组织余额明细分页、产品明细分页回调信息字段修改；

Browse Source
This commit is contained in:
gaoqr
2025-08-27 11:45:29 +08:00
parent bef0201dcf
commit aae6fe4a0e
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class BalanceDetailsRespVO {
@Schema(description = "支出/入账赠送金金额")
private BigDecimal bonusAmountChange;
private BigDecimal giftAmountChange;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/products/vo/productDetails/ProductDetailsRespVO.java
+9 -6
View File
@@ -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;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java
+3 -3
View File
@@ -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;
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java
+10
View File
@@ -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<Long> getOrganIdList() {
@@ -240,6 +245,11 @@ public class OrganServiceImpl implements OrganService {
// 复制系统配置里的相关配置
copySystemConfig(tenant.getId());
// 创建组织套餐
organAmountMapper.insert(OrganAmountDO.builder()
.organId(tenant.getId())
.build());
return tenant.getId();
}