原有充值功能 订单号 fix_bug

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);
     }
 

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;
 }

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);
 
 
 

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);