From fca5d8548303c264af45bd7a5efb9f500637d81b Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Mon, 22 Jul 2024 11:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9C=89=E5=85=85=E5=80=BC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20=E8=AE=A2=E5=8D=95=E5=8F=B7=20=20fix=5Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cc/yunxi/controller/IndexController.java   | 3 ++-
 .../cc/yunxi/domain/vo/enterprise/RechargeBalanceVO.java     | 5 +++++
 .../src/main/java/cc/yunxi/service/IEnterpriseService.java   | 2 +-
 .../java/cc/yunxi/service/impl/EnterpriseServiceImpl.java    | 4 ++--
 4 files changed, 10 insertions(+), 4 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 3637c89..25155f7 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/IndexController.java
@@ -73,7 +73,8 @@ public class IndexController {
     public CommonResult<Boolean> recharge(@Valid @RequestBody RechargeBalanceVO rechargeBalanceVO) {
         String merchantId = rechargeBalanceVO.getMerchantId();
         Integer amount = rechargeBalanceVO.getAmount();
-        enterpriseService.rechargeBalance(merchantId, amount);
+        String orderNumber = rechargeBalanceVO.getOrderNumber();
+        enterpriseService.rechargeBalance(merchantId, amount,orderNumber);
         return CommonResult.success(true);
     }
 
diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/RechargeBalanceVO.java b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/RechargeBalanceVO.java
index 72143ce..8d9d8ef 100644
--- a/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/RechargeBalanceVO.java
+++ b/nxhs-service/src/main/java/cc/yunxi/domain/vo/enterprise/RechargeBalanceVO.java
@@ -2,6 +2,7 @@ package cc.yunxi.domain.vo.enterprise;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
 import javax.validation.constraints.Max;
@@ -22,4 +23,8 @@ public class RechargeBalanceVO {
     @Min(value = 100, message = "充值金额最大为100元")
     @Max(value = 10000, message = "充值金额最大为10000元")
     private Integer amount;
+
+    @ApiModelProperty(value = "订单号")
+    @NotBlank(message = "订单号不能为空")
+    private String orderNumber;
 }
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 c56a6dd..fd99d5e 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/IEnterpriseService.java
@@ -43,7 +43,7 @@ public interface IEnterpriseService extends IService<Enterprise> {
      * @param merchantId
      * @param amount
      */
-    void rechargeBalance(String merchantId, Integer amount);
+    void rechargeBalance(String merchantId, Integer amount,String orderNumber);
 
 
 
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 7d54a6f..4b979c8 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
@@ -87,7 +87,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void rechargeBalance(String merchantId, Integer amount) {
+    public void rechargeBalance(String merchantId, Integer amount,String orderNumber) {
         LocalDateTime now = LocalDateTime.now();
         // 余额充值
         Enterprise enterprise = this.getEnterpriseById(merchantId, true);
@@ -103,7 +103,7 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper, Enterpr
         accountBill.setBillNumber(CommonUtil.getIdNumber(BusinessCodeEnum.BILL.getCode()));
         accountBill.setAccountBalance(fund);
         accountBill.setIncomeAmount(rechargeAmount);
-        accountBill.setOrderNumber("0");
+        accountBill.setOrderNumber(orderNumber);
 
         accountBill.setRemark("充值金额" + rechargeAmount.setScale(2, RoundingMode.HALF_UP) + "元");
         accountBill.setCreatorTime(now);