提交 6caf5af9 authored 作者: 吴德鹏's avatar 吴德鹏

Merge branch 'function-1.01' into dev

...@@ -72,6 +72,8 @@ public class CartController extends Controller { ...@@ -72,6 +72,8 @@ public class CartController extends Controller {
if (itemCount <= 0) { if (itemCount <= 0) {
record.setCheckFlag(0); record.setCheckFlag(0);
itemCount = 0; itemCount = 0;
if (itemCount != 0)
record.setItemCount(itemCount);
} }
result.setData(itemCount); result.setData(itemCount);
result.setMessage("Out of stock"); result.setMessage("Out of stock");
......
server.servlet.context-path=/zion server.servlet.context-path=/zion
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
server.port=8083 server.port=8083
spring.profiles.active=dev spring.profiles.active=test
#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=Diaoyunnuli.8 #spring.datasource.password=Diaoyunnuli.8
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论