From 9ee654e9a8e343449509e4aadc4ea2eff1afb921 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Dec 2020 11:10:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 10 ++++++----
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index e517a1f..85c7715 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -8,10 +8,7 @@
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author wzy
@@ -38,5 +35,10 @@
return ajaxResult;
}
+ @PostMapping(value = "/findBeautician")
+ public AjaxResult findBeautician() {
+ return null;
+ }
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
index 80af2ef..61b165b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java
@@ -522,7 +522,7 @@
goodsDetailVo.setGoodsType(shoppingGoods.getGoodType());
goodsDetailVo.setDesc(shoppingGoods.getDescription());
goodsDetailVo.setMaxSaleCnt(shoppingGoods.getCarMaxSaleCount());
- goodsDetailVo.setLimitBuyCnt(shoppingGoods.getIsOnce());
+ goodsDetailVo.setLimitBuyCnt(shoppingGoods.getCarUseCount().toString());
goodsDetailVo.setMeasure(shoppingGoods.getMeasure());
goodsDetailVo.setVolume(shoppingGoods.getVolume());
goodsDetailVo.setSalePrice(BigDecimal.valueOf(shoppingGoods.getSealPice()));
--
Gitblit v1.9.1