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 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 { * @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