From b90f6bc17e52d6071ac8172744f11cdbdd9342f7 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 19 May 2025 16:25:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(rebate):=20=E8=B0=83=E6=95=B4=E6=9C=9F?= =?UTF-8?q?=E9=97=B4=E8=BF=94=E5=88=A9=E9=87=91=E9=A2=9D=E5=8F=82=E6=95=B0?= =?UTF-8?q?(=E5=BE=85=E5=AE=9A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/bo/TzcRebatePeriodEditParam.java | 43 +++++++++++++++++++ .../controller/TzcRebatePeriodController.java | 25 +++++++++-- 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodEditParam.java diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodEditParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodEditParam.java new file mode 100644 index 0000000..b98dfbe --- /dev/null +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodEditParam.java @@ -0,0 +1,43 @@ +package com.qs.serve.modules.tzc.entity.bo; + +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; + +/** + * 返利适用期间 实体类 + * @author YenHex + * @since 2025-04-15 + */ +@Data +public class TzcRebatePeriodEditParam implements Serializable { + + private static final long serialVersionUID = 1L; + + private Long id; + + //** 自动获取发货金额(针对返利业务) */ + //private BigDecimal autoDispatchAmt; + + /** 实际发货金额 */ + private BigDecimal finalDispatchAmt; + + /** 周期结算 */ + //private BigDecimal autoRebatePeriodAmt; + + /** 周期结算 */ + private BigDecimal finalRebatePeriodAmt; + + /** 周期结算 */ + //private BigDecimal autoRebateYearAmt; + + /** 周期结算 */ + private BigDecimal finalRebateYearAmt; + + +} + diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebatePeriodController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebatePeriodController.java index 82d80ea..4a37a91 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebatePeriodController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebatePeriodController.java @@ -1,16 +1,16 @@ package com.qs.serve.modules.tzc.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.utils.CopierUtil; import com.qs.serve.framework.base.model.R; import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.service.TbsActivityService; import com.qs.serve.modules.tzc.entity.TzcRebatePeriod; +import com.qs.serve.modules.tzc.entity.bo.TzcRebatePeriodEditParam; import com.qs.serve.modules.tzc.service.TzcRebatePeriodService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; @@ -28,6 +28,11 @@ public class TzcRebatePeriodController { private final TzcRebatePeriodService tzcRebatePeriodService; private final TbsActivityService tbsActivityService; + /** + * 根据活动id列表查询返佣期间列表 + * @param activityIds + * @return + */ @GetMapping("/listByActivityIds") public R listByActivityIds(List activityIds) { List activityList = tbsActivityService.listByIds(activityIds); @@ -36,4 +41,18 @@ public class TzcRebatePeriodController { return R.ok(periodList); } + /** + * 编辑返佣期间金额 + * @param periodList + * @return + */ + @PostMapping("/editPeriodAmountList") + public R editPeriodAmountList(@RequestBody List periodList){ + for (TzcRebatePeriodEditParam param : periodList) { + TzcRebatePeriod period = CopierUtil.copy(param, new TzcRebatePeriod()); + tzcRebatePeriodService.updateById(period); + } + return R.ok(); + } + }