caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步

Browse Source
This commit is contained in:
lifenlong 2021-07-01 08:35:18 +08:00
commit cce14b4794
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<artifactId>admin</artifactId> <artifactId>admin</artifactId>

4
buyer-api/pom.xml
View File

@ -10,14 +10,14 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>

4
common-api/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

8
config/application.yml
View File

@ -77,7 +77,7 @@ spring:
default-datasource: default-datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.0.116:3306/Bulbasaur?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root username: root
password: lilishop password: lilishop
maxActive: 20 maxActive: 20
@ -194,9 +194,9 @@ logging:
# 输出级别 # 输出级别
level: level:
cn.lili: info cn.lili: info
# org.hibernate: debug org.hibernate: debug
# org.springframework: debug org.springframework: debug
# org.springframework.data.mongodb.core: debug org.springframework.data.mongodb.core: debug
file: file:
# 指定路径 # 指定路径
path: lili-logs path: lili-logs

4
consumer/pom.xml
View File

@ -8,14 +8,14 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</dependency> </dependency>
<dependency> <dependency>

2
framework/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>

8
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -235,19 +235,19 @@ public class Goods extends BaseEntity {
if (sku.get("sn") == null) { if (sku.get("sn") == null) {
throw new ServiceException(ResultCode.GOODS_SKU_SN_ERROR); throw new ServiceException(ResultCode.GOODS_SKU_SN_ERROR);
} }
if (StringUtil.isEmpty(sku.get("price").toString()) || Convert.toDouble( sku.get("price").toString()) <= 0) { if (StringUtil.isEmpty(sku.get("price").toString()) || Convert.toDouble(sku.get("price")) <= 0) {
throw new ServiceException(ResultCode.GOODS_SKU_PRICE_ERROR); throw new ServiceException(ResultCode.GOODS_SKU_PRICE_ERROR);
} }
if (StringUtil.isEmpty(sku.get("cost").toString()) || Convert.toDouble( sku.get("cost").toString()) <= 0) { if (StringUtil.isEmpty(sku.get("cost").toString()) || Convert.toDouble(sku.get("cost")) <= 0) {
throw new ServiceException(ResultCode.GOODS_SKU_COST_ERROR); throw new ServiceException(ResultCode.GOODS_SKU_COST_ERROR);
} }
//虚拟商品没有重量字段 //虚拟商品没有重量字段
if(sku.containsKey("weight")) { if (sku.containsKey("weight")) {
if (StringUtil.isEmpty(sku.get("weight").toString()) || Convert.toDouble(sku.get("weight").toString()) < 0) { if (StringUtil.isEmpty(sku.get("weight").toString()) || Convert.toDouble(sku.get("weight").toString()) < 0) {
throw new ServiceException(ResultCode.GOODS_SKU_WEIGHT_ERROR); throw new ServiceException(ResultCode.GOODS_SKU_WEIGHT_ERROR);
} }
} }
if (StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt( sku.get("quantity").toString()) < 0) { if (StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt(sku.get("quantity").toString()) < 0) {
throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR); throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR);
} }

4
manager-api/pom.xml
View File

@ -8,14 +8,14 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
pom.xml
View File

@ -12,11 +12,11 @@
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
<properties> <properties>
<docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry> <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
<images-version>0.0.5</images-version> <images-version>0.0.1</images-version>
</properties> </properties>
<modules> <modules>
<module>framework</module> <module>framework</module>

4
seller-api/pom.xml
View File

@ -8,14 +8,14 @@
<parent> <parent>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>lili-shop-parent</artifactId> <artifactId>lili-shop-parent</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>cn.lili</groupId> <groupId>cn.lili</groupId>
<artifactId>framework</artifactId> <artifactId>framework</artifactId>
<version>1.0.1</version> <version>4.2.0</version>
</dependency> </dependency>
</dependencies> </dependencies>