From 0452b9159660418367e914e01cb96f61665d3823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LI-CCONG=5C=E6=9D=8E=E8=81=AA=E8=81=AA?= <1441652193@qq.com> Date: Wed, 27 Mar 2024 13:45:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E4=BD=99=E9=A2=9D=E5=85=85?= =?UTF-8?q?=E5=80=BC=E5=8A=9F=E8=83=BDv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/yunxi/controller/IndexController.java | 21 +++++++++-- .../domain/po/EnterpriseAccountBill.java | 8 ++-- .../cc/yunxi/service/IEnterpriseService.java | 8 ++++ .../service/impl/EnterpriseServiceImpl.java | 37 +++++++++++++++++++ 4 files changed, 66 insertions(+), 8 deletions(-) diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java b/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java index 06722e1..f71c8f3 100644 --- a/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java +++ b/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java @@ -9,6 +9,7 @@ import cc.yunxi.domain.po.Product; import cc.yunxi.domain.vo.priceproduct.ProductSimpleVO; import cc.yunxi.enums.UserTypeEnum; import cc.yunxi.service.IClientService; +import cc.yunxi.service.IEnterpriseService; import cc.yunxi.service.IPriceProductService; import cc.yunxi.utils.UserContext; import io.swagger.annotations.Api; @@ -18,10 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.DecimalMin; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; import java.math.BigDecimal; import java.util.Collections; import java.util.List; @@ -38,6 +36,8 @@ public class IndexController { private final IClientService clientService; + private final IEnterpriseService enterpriseService; + @ApiOperation("废品类目列表") @GetMapping("/products") @@ -60,4 +60,17 @@ public class IndexController { return CommonResult.success(true); } + + @ApiOperation(value = "商户余额充值", hidden = true) + @PostMapping("/recharge-balance") + public CommonResult recharge( + @NotBlank(message = "商户号不能为空") + String merchantId, + @NotNull(message = "充值金额不能为空") + @Min(value = 100, message = "充值金额最大为100元") + @Max(value = 10000, message = "充值金额最大为10000元") Integer amount) throws Exception { + enterpriseService.rechargeBalance(merchantId, amount); + return CommonResult.success(true); + } + } diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java index 5283001..5fac14e 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java @@ -50,11 +50,11 @@ public class EnterpriseAccountBill { // @TableField("bill_status_id") // private String billStatusId; -// @ApiModelProperty("收入(元)") -// @TableField("income_amount") -// private BigDecimal incomeAmount; + @ApiModelProperty("充值(元)") + @TableField("income_amount") + private BigDecimal incomeAmount; - @ApiModelProperty("交易额") + @ApiModelProperty("交易额(元)") @TableField("payout_amount") private BigDecimal payoutAmount; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java index 81abdb1..650646d 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java @@ -26,4 +26,12 @@ public interface IEnterpriseService extends IService { * @return Enterprise */ Enterprise getEnterpriseById(String enterpriseId); + + + /** + * 商户余额充值 + * @param merchantId + * @param amount + */ + void rechargeBalance(String merchantId, Integer amount); } diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java index a06ab57..05ded7b 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java @@ -1,9 +1,13 @@ package cc.yunxi.service.impl; import cc.yunxi.common.exception.BizIllegalException; +import cc.yunxi.common.utils.CommonUtil; import cc.yunxi.domain.po.Enterprise; +import cc.yunxi.domain.po.EnterpriseAccountBill; import cc.yunxi.domain.po.RecycleStation; +import cc.yunxi.enums.BusinessCodeEnum; import cc.yunxi.enums.GlobalStatusEnum; +import cc.yunxi.mapper.EnterpriseAccountBillMapper; import cc.yunxi.mapper.EnterpriseMapper; import cc.yunxi.service.IEnterpriseService; import cc.yunxi.service.IRecycleStationService; @@ -11,9 +15,13 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.time.LocalDateTime; /** *

@@ -29,6 +37,9 @@ public class EnterpriseServiceImpl extends ServiceImpl