From c0691d2302bbaed2a47b2b703b83ed5bc204e397 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 14:31:10 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index f63cc98..f299c30 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -9,6 +9,7 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.CreateServiceOrderDto;
import com.matrix.system.app.dto.ServiceOrderListDto;
+import com.matrix.system.app.dto.ServiceVipProjDto;
import com.matrix.system.app.mapper.SysBeauticianStateMapper;
import com.matrix.system.app.mapper.SysProjServiceMapper;
import com.matrix.system.app.mapper.SysProjUseMapper;
@@ -62,9 +63,9 @@
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = ServiceProductListVo.class)
})
- @GetMapping(value = "/findVipProject/{vipId}")
- public AjaxResult findVipProject(@PathVariable("vipId") Long vipId) {
- SysVipInfo vipInfo = sysVipInfoService.findById(vipId);
+ @PostMapping(value = "/findVipProject")
+ public AjaxResult findVipProject(@RequestBody @Validated ServiceVipProjDto serviceVipProjDto) {
+ SysVipInfo vipInfo = sysVipInfoService.findById(serviceVipProjDto.getVipId());
if (vipInfo == null) {
throw new GlobleException("会员不存在");
@@ -72,14 +73,15 @@
ServiceProductListVo productListVo = new ServiceProductListVo();
productListVo.setName(vipInfo.getVipName());
- productListVo.setVipId(vipId);
+ productListVo.setVipId(serviceVipProjDto.getVipId());
SysProjUse queryUse = new SysProjUse();
- queryUse.setVipId(vipId);
+ queryUse.setVipId(serviceVipProjDto.getVipId());
queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
queryUse.setTaocanId(-1L);
queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);
queryUse.setIsOver(Dictionary.FLAG_NO_N);
+ queryUse.setQueryKey(serviceVipProjDto.getQueryKey());
List<SysProjUse> projList = projUseService.findInPage(queryUse, null);
List<ServiceProjVo> serviceProjVos = SysProjUseMapper.INSTANCE.entityListToProjVoList(projList);
--
Gitblit v1.9.1