From bc0898f18e741571608176d89cdd16b94c781913 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 12 May 2022 10:25:42 +0800
Subject: [PATCH] fix money_card_use 默认储值卡处理
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
index 671059a..e099c42 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
@@ -29,7 +29,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
-import org.assertj.core.util.Arrays;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -91,7 +90,7 @@
* @return
*/
@ApiOperation(value = "获取用户所有可用的项目和套餐", notes = "获取用户所有可用的项目和套餐")
- @GetMapping(value = "/getUserProjInfo/{id}")
+ @GetMapping(value = "/getUserProjInfo/{vipId}")
public AjaxResult getUserProjInfo(@PathVariable("vipId")Long vipId) {
AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");
@@ -151,8 +150,14 @@
if(ObjectUtil.isNotEmpty(orderListDto.getClosureTime())){
projService.setClosureTime(orderListDto.getClosureTime());
}
+ if(ObjectUtil.isNotEmpty(orderListDto.getVipId())){
+ projService.setVipId(orderListDto.getVipId());
+ }
if(ObjectUtil.isNotEmpty(orderListDto.getQueryKey())){
projService.setQueryKey(orderListDto.getQueryKey());
+ }
+ if(StrUtil.isNotEmpty(orderListDto.getState())){
+ projService.setState(orderListDto.getState());
}
QueryUtil.setQueryLimitCom(projService);
List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
@@ -301,7 +306,9 @@
}
SysProjServices newSysProjServices = sysProjServicesService.addSysProjServices(sysProjServices);
if (newSysProjServices != null) {
- return AjaxResult.buildSuccessInstance(Arrays.asList(newSysProjServices));
+ AjaxResult result = AjaxResult.buildSuccessInstance("下单成功!");
+ result.putInMap("newSysProjServices", newSysProjServices);
+ return result;
} else {
return new AjaxResult(AjaxResult.STATUS_FAIL, "下单失败!");
}
--
Gitblit v1.9.1