From 89029e9ade03f3139c6afcd6bac48d9a668875f3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 十二月 2025 14:05:06 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java | 4
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 6
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java | 6
admin/src/views/business/goodsLabels.vue | 18 +-
server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java | 4
admin/src/views/business/platformGoods.vue | 30 +--
server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 9 +
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 318 ++++++++++++++++++++++++++++------
server/dmmall_service/src/main/java/com/doumee/config/listener/IntegralApplicationListener.java | 6
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopFollowServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java | 4
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java | 13 +
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/ShopFollowService.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/CollectService.java | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java | 9 +
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java | 4
server/dmmall_service/src/main/java/com/doumee/service/business/CommentService.java | 4
server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java | 4
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 8
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 10
server/dmmall_service/src/main/java/com/doumee/service/business/CardService.java | 2
server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java | 2
server/pom.xml | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/ZanService.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopCommentServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java | 8
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ZanServiceImpl.java | 2
server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java | 10
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CoffeeBeanTaskServiceImpl.java | 8
admin/src/views/business/planGoods.vue | 13
server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java | 2
server/dmmall_service/src/main/java/com/doumee/service/business/ShopCommentService.java | 2
server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java | 2
41 files changed, 373 insertions(+), 163 deletions(-)
diff --git a/admin/src/views/business/goodsLabels.vue b/admin/src/views/business/goodsLabels.vue
index 3d5adef..9f279dd 100644
--- a/admin/src/views/business/goodsLabels.vue
+++ b/admin/src/views/business/goodsLabels.vue
@@ -117,15 +117,15 @@
methods: {
statusChange (row) {
this.api.updateById({ id: row.id, status: row.status })
- .then(() => {
- this.$message.success('鎿嶄綔鎴愬姛')
- })
- .catch(e => {
- this.$message.error('鎿嶄綔鎴愬姛')
- })
- .then(() => {
- this.handlePageChange()
- })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛')
+ })
+ .catch(e => {
+ this.$message.error('鎿嶄綔鎴愬姛')
+ })
+ .then(() => {
+ this.handlePageChange()
+ })
}
}
}
diff --git a/admin/src/views/business/planGoods.vue b/admin/src/views/business/planGoods.vue
index 71f724a..5553dc5 100644
--- a/admin/src/views/business/planGoods.vue
+++ b/admin/src/views/business/planGoods.vue
@@ -26,7 +26,7 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="涓婃灦鐘舵��" prop="status">
<el-select
v-model="searchForm.brandId"
@@ -89,7 +89,6 @@
<el-table-column prop="labels" label="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑" min-width="100px"></el-table-column> -->
<!-- v-if="containPermissions(['business:goods:update', 'business:goods:delete'])" -->
<el-table-column
-
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -163,7 +162,7 @@
labels: ''
},
labels: [],
-
+
}
},
provide() {
@@ -180,7 +179,7 @@
'field.main': 'id'
})
this.search()
-
+
labelList({
capacity: 999,
model: {
@@ -190,14 +189,14 @@
.then(res => {
this.labels = res.records
})
-
+
},
methods: {
handleClick(val) {
},
/**
- *
+ *
* @param {涓婁笅鐘舵�亇 status 0涓婃灦 1涓嬫灦
*/
issued(status) {
@@ -211,7 +210,7 @@
})
},
-
+
statusChange(row) {
updateById(row)
.then(() => {
diff --git a/admin/src/views/business/platformGoods.vue b/admin/src/views/business/platformGoods.vue
index d425ab0..cad4c97 100644
--- a/admin/src/views/business/platformGoods.vue
+++ b/admin/src/views/business/platformGoods.vue
@@ -69,20 +69,21 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="id" label="鍟嗗搧ID" min-width="100px"></el-table-column>
- <el-table-column prop="imgurl" label="鍟嗗搧淇℃伅" min-width="100px">
+ <el-table-column prop="imgurl" label="鍟嗗搧淇℃伅" min-width="200px">
<template slot-scope="{row}">
- <el-image :scr="row.imgurlfull" :preview-src-list="[row.imgurlfull]"></el-image>
+ <el-image v-if="row.imgurl" :src="row.resourcePath+row.imgurl" :preview-src-list="[row.resourcePath+row.imgurl]"></el-image>
{{ row.name }}
</template>
</el-table-column>
- <el-table-column prop="categoryName" label="鎵�灞炲垎绫�" min-width="100px"></el-table-column>
- <el-table-column prop="brandName" label="鎵�灞炲搧鐗�" min-width="100px"></el-table-column>
- <el-table-column prop="showPrice" label="灞曠ず浠锋牸" min-width="100px"></el-table-column>
- <el-table-column prop="salenum" label="搴撳瓨" min-width="100px"></el-table-column>
- <el-table-column prop="salenum" label="铏氭嫙閿�閲�" min-width="100px"></el-table-column>
- <el-table-column prop="salenum" label="瀹為檯閿�閲�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="id" label="鍟嗗搧ID" min-width="150px" ></el-table-column>
+ <el-table-column prop="name" label="鍟嗗搧鍚嶇О" min-width="150px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="categoryName" label="鎵�灞炲垎绫�" min-width="120px"></el-table-column>
+ <el-table-column prop="brandName" label="鎵�灞炲搧鐗�" min-width="120px"></el-table-column>
+ <el-table-column prop="price" label="灞曠ず浠锋牸" min-width="100px"></el-table-column>
+ <el-table-column prop="stockNum" label="鍓╀綑搴撳瓨閲�" min-width="100px"></el-table-column>
+ <el-table-column prop="salesVolume" label="瀹為檯閿�閲�" min-width="100px"></el-table-column>
+ <el-table-column prop="skuPrice" label="闆跺敭浠�(鍏�)" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏈�杩戞洿鏂版椂闂�" min-width="100px"></el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<el-switch
@@ -95,24 +96,15 @@
></el-switch>
</template>
</el-table-column>
- <!-- <el-table-column prop="isrec" label="鏄惁鎺ㄨ崘 0鍚� 1鏄�" min-width="100px"></el-table-column>
- <el-table-column prop="styleImg" label="鍜栬眴椋庡懗鍥�" min-width="100px"></el-table-column>
- <el-table-column prop="labels" label="鍟嗗搧鏍囩闆嗗悎,澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑" min-width="100px"></el-table-column> -->
- <!-- v-if="containPermissions(['business:goods:update', 'business:goods:delete'])" -->
<el-table-column
label="鎿嶄綔"
min-width="120"
fixed="right"
>
<template slot-scope="{row}">
- <template v-if="row.status==1">
<el-button type="text" @click="$refs.operaGoodsWindow.open('缂栬緫鍟嗗搧', row, 0)" v-permissions="['business:goods:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.operaPlatformGoodsSkuWindow.open('骞冲彴SKU', row)">SKU</el-button>
<el-button type="text" @click="deleteById(row)" v-permissions="['business:goods:delete']">鍒犻櫎</el-button>
- </template>
- <template v-else>
<el-button type="text" @click="$refs.operaGoodsDetailWindow.open('鍟嗗搧璇︽儏', row, 0)">鏌ョ湅璇︽儏</el-button>
- </template>
</template>
</el-table-column>
</el-table>
diff --git a/server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java b/server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java
index 2dd1a25..67a3e64 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/api/common/HomeContrller.java
@@ -61,7 +61,7 @@
//鐢ㄦ埛鎬绘暟
MPJLambdaWrapper<Member> memberWrapper = new MPJLambdaWrapper<>();
memberWrapper.eq(Member::getIsdeleted,Constants.ZERO);
- Integer memberCount=memberJoinMapper.selectCount(memberWrapper);
+ long memberCount=memberJoinMapper.selectCount(memberWrapper);
json.put("memberCount",memberCount);
//浠婃棩娲诲姩鐢ㄦ埛锛�
diff --git a/server/dmmall_service/src/main/java/com/doumee/config/listener/IntegralApplicationListener.java b/server/dmmall_service/src/main/java/com/doumee/config/listener/IntegralApplicationListener.java
index 6c2ac25..9046da1 100644
--- a/server/dmmall_service/src/main/java/com/doumee/config/listener/IntegralApplicationListener.java
+++ b/server/dmmall_service/src/main/java/com/doumee/config/listener/IntegralApplicationListener.java
@@ -58,7 +58,7 @@
//鍒嗕韩涓嶈秴杩囧洓娆�
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = sharesService.count(startDate, endDate, memberId, Arrays.asList(Constants.ShareType.SHARE_ACTIVITY_ACTIVITY.getKey(),1,2));
+ Long count = sharesService.count(startDate, endDate, memberId, Arrays.asList(Constants.ShareType.SHARE_ACTIVITY_ACTIVITY.getKey(),1,2));
if (count < Constants.OrderStatus.CLOSE.getKey()){
@@ -84,7 +84,7 @@
//鍒嗕韩娴锋姤涓嶈秴杩�1娆�
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = sharesService.count(startDate, endDate, memberId,Arrays.asList(5));
+ long count = sharesService.count(startDate, endDate, memberId,Arrays.asList(5));
if (count < Constants.ONE){
@@ -133,7 +133,7 @@
//璇勮涓嶈秴杩囧洓娆�
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = commentService.count(startDate, endDate, memberId);
+ long count = commentService.count(startDate, endDate, memberId);
if (count < 4){
Comment comment = (Comment) integralOBJ;
diff --git a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
index 0bf6c47..a82cd73 100644
--- a/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -919,7 +919,7 @@
HOMEZHUANQU(12, "棣栭〉涓撳尯", "棣栭〉涓撳尯"),
BIG_AREA(13, "鍖哄煙鍒嗙被", "鍖哄煙鍒嗙被"),
APPLICABLE_BRAND(14, "閫傜敤鍝佺墝", "閫傜敤鍝佺墝"),
- SERIES_BRAND(15, "绯诲垪鍝佺墝", "绯诲垪鍝佺墝"),
+ SERIES_BRAND(15, "鍝佺墝绯诲垪", "鍝佺墝绯诲垪"),
;
// 鎴愬憳鍙橀噺
private String name;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
index 2b6990b..01f5a43 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java
@@ -97,7 +97,7 @@
@ApiModelProperty(value = "鍙戞斁鎬婚噺", example = "1")
@ExcelColumn(name="鍙戞斁鎬婚噺")
- private Integer num;
+ private Long num;
@ApiModelProperty(value = "璇存槑")
@ExcelColumn(name="璇存槑")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
index 240d1c2..a8e80dc 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -74,10 +74,9 @@
@ExcelColumn(name="鍝佺墝缂栫爜锛堝叧鑱攍abels琛級")
private Integer brandId;
- @ApiModelProperty(value = "灞曠ず浠锋牸", example = "1")
+ @ApiModelProperty(value = "灞曠ず浠锋牸(鍑哄巶浠�)", example = "1")
@ExcelColumn(name="灞曠ず浠锋牸")
private BigDecimal price;
-
@ApiModelProperty(value = "鍒濆閿�閲�", example = "1")
@ExcelColumn(name="鍒濆閿�閲�")
private Integer salenum;
@@ -131,6 +130,9 @@
private BigDecimal deductRata;
+ @ApiModelProperty(value = "sku閲嶉噺", hidden = true)
+ @TableField(exist = false)
+ private BigDecimal weight;
@ApiModelProperty(value = "sku閲戦", hidden = true)
@TableField(exist = false)
private BigDecimal skuPrice;
@@ -175,11 +177,16 @@
@ApiModelProperty(value = "tab鍒囨崲鐘舵��;1鍏ㄩ儴锛�2锛屽凡鍞絼锛�3鍥炴敹")
@TableField(exist = false)
private Integer tabStatus;
-
+ @ApiModelProperty(value = "鍗曚綅")
+ @TableField(exist = false)
+ private String unitName;
@ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
@TableField(exist = false)
private List<Sku> skuList;
+ @ApiModelProperty(value = "鍟嗗搧sku淇℃伅")
+ @TableField(exist = false)
+ private List<Labels> brandList;
@ApiModelProperty(value = "鍟嗗搧SKU瑙勬牸缁�")
@TableField(exist = false)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
index 34de15d..0cdb74d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsSku.java
@@ -71,7 +71,7 @@
private String imgurl;
@ApiModelProperty(value = "鍗曚綅")
@ExcelColumn(name="鍗曚綅")
- private String unit;
+ private String unitName;
@ApiModelProperty(value = "绉垎鏈�澶氭姷鎵ｆ瘮渚�")
@ExcelColumn(name="绉垎鏈�澶氭姷鎵ｆ瘮渚�")
private BigDecimal integralRate;
@@ -86,7 +86,7 @@
@ApiModelProperty(value = "搴撳瓨閲�", example = "1")
@ExcelColumn(name="搴撳瓨閲�")
- private Integer stock;
+ private BigDecimal stock;
@ApiModelProperty(value = "鍟嗗搧閲嶉噺(kg)", example = "1")
@ExcelColumn(name="鍟嗗搧閲嶉噺(kg)")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
index 1edc5e7..d384a80 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Labels.java
@@ -87,6 +87,12 @@
@ApiModelProperty(value = "鐪佷唤鍖哄煙缂栫爜闆嗗悎", example = "1")
@TableField(exist = false)
private List<Integer> areaIdList;
+ @ApiModelProperty(value = "涓嬬骇缂栫爜闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Integer> childIdList;
+ @ApiModelProperty(value = "涓嬬骇缂栫爜闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Labels> childList;
@ApiModelProperty(value = "鐪佷唤鍖哄煙闆嗗悎", example = "1")
@TableField(exist = false)
private List<Areas> areaList;
@@ -99,6 +105,9 @@
@ApiModelProperty(value = "鐖剁被鍚嶇О")
@TableField(exist = false)
private String parentName;
+ @ApiModelProperty(value = "鐖剁被鍚嶇О")
+ @TableField(exist = false)
+ private int goodsNum;
@ApiModelProperty(value = "鍒嗙被锛氫竴绾у垎绫�0锛屼簩绾у垎绫�1")
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java
index 96b9598..01d22a9 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/activity/BaseActivity.java
@@ -57,7 +57,7 @@
private Integer limitnum;
@ApiModelProperty(value = "鎶ュ悕浜烘暟")
- private Integer applicantNum;
+ private Long applicantNum;
@ApiModelProperty(value = "娲诲姩浠锋牸锛坱ype涓烘椿鍔級")
private BigDecimal price;
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java
index c53c44a..63226eb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/coffeebean/CoffeeBeanTaskDTO.java
@@ -22,6 +22,6 @@
private String label;
@ApiModelProperty(value = "瀹屾垚娆℃暟 | 姣忓懆 鍒嗕韩璧勮 4 鍒嗕韩閭�璇锋捣鎶� 1 鍙戝竷璇勮 4 ")
- private Integer doneCount;
+ private long doneCount;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java
index d839197..09cb9d4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/dto/shop/ShopDataStatisticsDTO.java
@@ -18,11 +18,11 @@
private String shopName;
@ApiModelProperty(value = "鍟嗗鏍搁攢鏁�")
- private Integer shopCouponUseCount;
+ private long shopCouponUseCount;
@ApiModelProperty(value = "鍟嗗绮変笣鏁�")
- private Integer shopFansCount;
+ private long shopFansCount;
@ApiModelProperty(value = "鍟嗗鏂伴矞浜�")
- private Integer shopNewCount;
+ private long shopNewCount;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java
index 6e4c8b4..e7c2074 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/MyPageResponse.java
@@ -14,18 +14,18 @@
public class MyPageResponse {
@ApiModelProperty(value = "寰呮敮浠樿鍗曟暟閲�")
- private Integer waitPayOrders;
+ private Long waitPayOrders;
@ApiModelProperty(value = "寰呭彂璐ц鍗曟暟閲�")
- private Integer waitOrders;
+ private Long waitOrders;
@ApiModelProperty(value = "寰呮敹璐ц鍗曟暟閲�")
- private Integer waitReceivedOrders;
+ private Long waitReceivedOrders;
@ApiModelProperty(value = "宸插畬鎴愯鍗曟暟閲�")
- private Integer finishOrders;
+ private Long finishOrders;
@ApiModelProperty(value = "鍞悗涓鍗曟暟閲�")
- private Integer afterOrders;
+ private Long afterOrders;
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/CardService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/CardService.java
index 5f346ac..2f81533 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/CardService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/CardService.java
@@ -97,7 +97,7 @@
* @param card 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(Card card);
+ Long count(Card card);
/**
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/CollectService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/CollectService.java
index 50cdf10..0d3816a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/CollectService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/CollectService.java
@@ -96,7 +96,7 @@
* @param collect 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(Collect collect);
+ Long count(Collect collect);
/**
* 鏉′欢缁熻
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/CommentService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/CommentService.java
index 5487eb4..62c876a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/CommentService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/CommentService.java
@@ -98,10 +98,10 @@
* @param comment 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(Comment comment);
+ Long count(Comment comment);
- Integer count(Date start, Date end, Integer memberId);
+ Long count(Date start, Date end, Integer memberId);
/**
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
index 180dee1..a9c90a0 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java
@@ -98,7 +98,7 @@
* @param memberCoupon 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(MemberCoupon memberCoupon);
+ long count(MemberCoupon memberCoupon);
/****************************************绉诲姩绔帴鍙ｅ紑濮�********************************************************************/
@@ -120,7 +120,7 @@
* @param couponType
* @return
*/
- Integer memberCouponNum(BigDecimal price, Integer memberId, Integer couponType);
+ long memberCouponNum(BigDecimal price, Integer memberId, Integer couponType);
/**
*
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
index 37fbd50..72b8686 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/SharesService.java
@@ -97,5 +97,5 @@
*/
long count(Shares shares);
- Integer count(Date start,Date end, Integer memberId,List<Integer> types);
+ long count(Date start,Date end, Integer memberId,List<Integer> types);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopCommentService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopCommentService.java
index 3fecf95..7b2bd3f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopCommentService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopCommentService.java
@@ -98,7 +98,7 @@
*/
long count(ShopComment shopComment);
- Integer count(Date start, Date end, Integer memberId, Integer type);
+ long count(Date start, Date end, Integer memberId, Integer type);
/**
* 鑾峰彇搴楅摵璇勪环鎵撳垎
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopFollowService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopFollowService.java
index 24c91f0..35415e0 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopFollowService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopFollowService.java
@@ -96,7 +96,7 @@
* @param shopFollow 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(ShopFollow shopFollow);
+ long count(ShopFollow shopFollow);
/**
* 鏌ヨ鑾峰彇鍏虫敞瀵硅薄
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java
index a4f0978..f0d3f89 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ShopNewsService.java
@@ -103,7 +103,7 @@
* @param shopNews 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(ShopNews shopNews);
+ long count(ShopNews shopNews);
/**
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ZanService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ZanService.java
index a6fe553..756cf4b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ZanService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ZanService.java
@@ -96,7 +96,7 @@
* @param zan 瀹炰綋瀵硅薄
* @return long
*/
- Integer count(Zan zan);
+ long count(Zan zan);
Map<Integer, ZanDTO> count(List<Integer> objIds);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
index e854474..73e923b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java
@@ -560,7 +560,7 @@
wrapper.lambda().eq(ActivitySign::getActivityId,activityId)
.in(ActivitySign::getPayStatus, Arrays.asList(0,1));
//鑾峰彇鎶ュ悕浜烘暟
- Integer applicantNum = activitySignMapper.selectCount(wrapper);
+ Long applicantNum = activitySignMapper.selectCount(wrapper);
wrapper.clear();
wrapper.lambda().eq(ActivitySign::getActivityId,activityId)
@@ -570,7 +570,7 @@
//鑾峰彇鎶ュ悕鐘舵��
getPersonActivityStatus(activity, ActivitySignResult,baseActivity);
// baseActivity.setPersonActivityStatus(personActivityStatus);
- baseActivity.setApplicantNum(applicantNum);
+ baseActivity.setApplicantNum(Constants.formatLongNum(applicantNum));
boolean mqResult= normalMsgProducer.sendMsg(Constants.MQ_TAG.activity,JSONObject.toJSONString(activity));
//
// RocketMessageProducer.producerMsg(Constants.MQ_TAG.activity,null, JSONObject.toJSONString(activity));
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java
index 4dd29e6..113c64f 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardParamServiceImpl.java
@@ -114,9 +114,9 @@
QueryWrapper<Card> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(Card::getParamId,cardParam.getId());
- Integer integer = cardMapper.selectCount(wrapper);
+ Long integer =Constants.formatLongNum( cardMapper.selectCount(wrapper));
- if (integer > Constants.ZERO){
+ if (integer!=null && integer > Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″凡缁忕敓鎴愪笉鍏佽淇敼閰嶇疆");
}
CardParam update = new CardParam();
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
index 46b2aae..86d33f3 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CardServiceImpl.java
@@ -72,11 +72,11 @@
}
Integer num = card.getNum();
- Integer startNo = Integer.valueOf(cardParam.getStartNo());
+ int startNo = Integer.valueOf(cardParam.getStartNo());
Card count = new Card();
count.setParamId(card.getParamId());
- Integer countNum = count(count);
- startNo = countNum != 0 ? startNo+countNum : startNo;
+ long countNum = Constants.formatLongNum(count(count));
+ startNo = countNum != 0 ? (int) (startNo + countNum) : startNo;
List<Integer> list = new ArrayList<>();
for (int i = 0; i <num; i++) {
@@ -201,7 +201,7 @@
}
@Override
- public Integer count(Card card) {
+ public Long count(Card card) {
QueryWrapper<Card> wrapper = new QueryWrapper<>(card);
return cardMapper.selectCount(wrapper);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CoffeeBeanTaskServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CoffeeBeanTaskServiceImpl.java
index 367ca96..31e5168 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CoffeeBeanTaskServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CoffeeBeanTaskServiceImpl.java
@@ -70,7 +70,7 @@
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = sharesService.count(startDate, endDate, loginUserInfo.getMemberId(), Arrays.asList(0,1,2,3,4));
+ long count = sharesService.count(startDate, endDate, loginUserInfo.getMemberId(), Arrays.asList(0,1,2,3,4));
CoffeeBeanTaskDTO dto = new CoffeeBeanTaskDTO();
dto.setCode(dictData.getCode());
dto.setDoneCount(count);
@@ -82,7 +82,7 @@
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = sharesService.count(startDate, endDate, loginUserInfo.getMemberId(),Arrays.asList(5));
+ long count = sharesService.count(startDate, endDate, loginUserInfo.getMemberId(),Arrays.asList(5));
CoffeeBeanTaskDTO dto = new CoffeeBeanTaskDTO();
dto.setCode(dictData.getCode());
dto.setDoneCount(count);
@@ -99,8 +99,8 @@
Date startDate = DateUtil.toDate(DateUtil.getMonday());
Date endDate = DateUtil.toDate(DateUtil.getSunday());
- Integer count = commentService.count(startDate, endDate, loginUserInfo.getMemberId());
- Integer shopcount = shopCommentService.count(startDate, endDate, loginUserInfo.getMemberId(),null);
+ long count = commentService.count(startDate, endDate, loginUserInfo.getMemberId());
+ long shopcount = shopCommentService.count(startDate, endDate, loginUserInfo.getMemberId(),null);
CoffeeBeanTaskDTO dto = new CoffeeBeanTaskDTO();
dto.setCode(dictData.getCode());
dto.setDoneCount(count+shopcount);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
index 280cefc..f574463 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java
@@ -158,7 +158,7 @@
}
@Override
- public Integer count(Collect collect) {
+ public Long count(Collect collect) {
QueryWrapper<Collect> wrapper = new QueryWrapper<>(collect);
return collectMapper.selectCount(wrapper);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
index a77b6a2..64c0413 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CommentServiceImpl.java
@@ -172,13 +172,13 @@
}
@Override
- public Integer count(Comment comment) {
+ public Long count(Comment comment) {
QueryWrapper<Comment> wrapper = new QueryWrapper<>(comment);
return commentMapper.selectCount(wrapper);
}
@Override
- public Integer count(Date start, Date end, Integer memberId) {
+ public Long count(Date start, Date end, Integer memberId) {
QueryWrapper<Comment> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(Comment::getMemberId,memberId)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index e3eee49..3559a14 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -101,61 +101,191 @@
private UploadFileService uploadFileService;
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer create(Goods goods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
isCreateParamValid(goods, user);
-
+ Date date =new Date();
goods.setIsdeleted(Constants.ZERO);
- goods.setCreateDate(new Date());
+ goods.setCreateDate(date);
goods.setCreator(user.getId());
+ goods.setEditDate(date);
+ goods.setEditor(user.getId());
goods.setStatus(Constants.ONE);
goods.setIsrec(Constants.ZERO);
if(StringUtils.isNotBlank(goods.getLabels())){
goods.setLabels( StringUtils.removeEnd( goods.getLabels().replace("锛�",","),","));
}
goodsMapper.insert(goods);
- dealBatchMultiFiles(goods, goods.getFileList(), user);
+ dealDefaultGoodsSku(goods);
+ dealBatchMultiFiles(goods, goods.getFileList(), user,false);
return goods.getId();
}
+ private void dealDefaultGoodsSku(Goods goods) {
+ Date date = goods.getEditDate();
+ Integer userId = goods.getEditor();
+ Sku sku = new Sku();
+ sku.setIsdeleted(Constants.ZERO);
+ sku.setCreateDate(date);
+ sku.setCreator(userId);
+ sku.setEditDate(date);
+ sku.setEditor(userId);
+ sku.setGoodsId(goods.getId());
+ sku.setName("榛樿");
+ sku.setSortnum(0);
+ skuMapper.insert(sku);
- public void dealBatchMultiFiles(Goods goods, List<Multifile> fileList, LoginUserInfo user) {
+ SkuAttr skuAttr = new SkuAttr();
+ skuAttr.setIsdeleted(Constants.ZERO);
+ skuAttr.setCreateDate(date);
+ skuAttr.setCreator(userId);
+ skuAttr.setEditDate(date);
+ skuAttr.setEditor(userId);
+ skuAttr.setSkuId(sku.getId());
+ skuAttr.setName("榛樿");
+ skuAttr.setSortnum(0);
+ skuAttrMapper.insert(skuAttr);
+
+ GoodsSku goodsSku = new GoodsSku();
+ goodsSku.setIsdeleted(Constants.ZERO);
+ goodsSku.setCreateDate(date);
+ goodsSku.setCreator(userId);
+ goodsSku.setEditDate(date);
+ goodsSku.setEditor(userId);
+ goodsSku.setSkuId(sku.getId());
+ goodsSku.setGoodsId(goods.getId());
+ goodsSku.setName(goods.getName());
+ goodsSku.setPrice(goods.getSkuPrice());
+ goodsSku.setShowPrice(goods.getPrice());
+ goodsSku.setStock(goods.getStockNum());
+ goodsSku.setIntegralRate(goods.getDeductRata());
+ goodsSku.setUnitName(goods.getUnitName());
+ goodsSku.setWeight(goods.getWeight());
+ goodsSku.setImgurl(goods.getImgurl());
+ goodsSku.setStatus(goods.getStatus());
+ goodsSkuMapper.insert(goodsSku);
+
+ GoodsSkuAttr goodsSkuAttr = new GoodsSkuAttr();
+ goodsSkuAttr.setIsdeleted(Constants.ZERO);
+ goodsSkuAttr.setCreateDate(date);
+ goodsSkuAttr.setCreator(userId);
+ goodsSkuAttr.setEditDate(date);
+ goodsSkuAttr.setEditor(userId);
+ goodsSkuAttr.setSkuId(sku.getId());
+ goodsSkuAttr.setGoodsSkuId(goodsSku.getId());
+ goodsSkuAttr.setSkuAttrId(skuAttr.getId());
+ goodsSkuAttrMapper.insert(goodsSkuAttr);
+ }
+
+ public void dealBatchMultiFiles(Goods goods, List<Multifile> fileList, LoginUserInfo user,boolean update) {
Date today = new Date();
- Multifile del = new Multifile();
- del.setObjId(goods.getId());
- multifileMapper.delete(new QueryWrapper<>(del));
- fileList.stream().forEach(s -> {
- s.setIsdeleted(Constants.ZERO);
- s.setCreator(user.getId());
- s.setCreateDate(today);
- s.setObjId(goods.getId());
- s.setType(Constants.ZERO);
- s.setObjType(Constants.MultiFile.PLATFORM_GOOD_ROTATION.getKey());
- multifileMapper.insert(s);
- /* if(Constants.equalsInteger(goods.getType(),Constants.ZERO)){
- //骞冲彴鍟嗗煄
+ //娓呯┖鍘熸湁鐨�
+ if(update){
+ multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,goods.getId()));
+ }
+ if(fileList!=null && fileList.size()>0){
+ List<Multifile> multifileList = new ArrayList<>();
+ fileList.stream().forEach(s -> {
+ if(StringUtils.isNotBlank(s.getFileurl())){
+ s.setIsdeleted(Constants.ZERO);
+ s.setCreator(user.getId());
+ s.setCreateDate(today);
+ s.setObjId(goods.getId());
+ s.setType(Constants.ZERO);
+ s.setObjType(Constants.MultiFile.PLATFORM_GOOD_ROTATION.getKey());
+ multifileList.add(s);
+ }
+ });
+ if(multifileList.size()>0){
+ multifileMapper.insert(multifileList);
}
- if(Constants.equalsInteger(goods.getType(),Constants.ONE)){
- //鍜栬眴鍟嗗煄
- }
-
- if(Constants.equalsInteger(goods.getType(),Constants.TWO)){
- //鍜栧暋璁″垝鍟嗗搧
- }*/
- });
-
+ }
}
public void isCreateParamValid(Goods goods, LoginUserInfo user) {
//骞冲彴鍟嗗煄
if (StringUtils.isBlank(goods.getName())
|| goods.getCategoryId() == null
+ || goods.getBrandList() == null
+ || goods.getBrandList().size() == 0
+ || goods.getWeight() == null
+ || goods.getPrice() == null
+ || goods.getSkuPrice() == null
|| StringUtils.isBlank(goods.getImgurl())
- || org.apache.commons.collections.CollectionUtils.isEmpty(goods.getFileList())
- ) {
+ || org.apache.commons.collections.CollectionUtils.isEmpty(goods.getFileList())) {
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
}
+ //鏌ヨ鍒嗙被
+ Labels cate = labelsMapper.selectById(goods.getCategoryId());
+ if(cate == null || Constants.equalsInteger(cate.getIsdeleted(),Constants.ONE)
+ ||! Constants.equalsInteger(cate.getType(),Constants.LabelsType.GOODSTYPE.getKey())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鍒嗙被淇℃伅涓嶅瓨鍦�");
+ }
+ if(goods.getBrandId()!=null){
+ Labels brand = labelsMapper.selectById(goods.getCategoryId());
+ if(brand == null || Constants.equalsInteger(brand.getIsdeleted(),Constants.ONE)
+ ||! Constants.equalsInteger(brand.getType(),Constants.LabelsType.GOODSBRAND.getKey())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鍝佺墝淇℃伅涓嶅瓨鍦�");
+ }
+ }
+ List<Integer> bIds = new ArrayList<>();
+ for(Labels b : goods.getBrandList()){
+ bIds.add(b.getId());
+ if(b.getChildIdList() == null || b.getChildIdList().size() ==0){
+ bIds.addAll(b.getChildIdList());
+ }
+ }
+ List<String> idsBrand = new ArrayList<>();
+ List<String> idsSerial = new ArrayList<>();
+ //鏌ヨ鍏ㄩ儴閫傜敤鍝佺墝鍜岀郴鍒楁暟鎹�
+ List<Labels> allBrands = labelsMapper.selectList(new QueryWrapper<Labels>().lambda()
+ .in(Labels::getId,bIds)
+ .eq(Labels::getIsdeleted,Constants.ZERO)
+ );
+ for(Labels b : goods.getBrandList()){
+ Labels tb = findLabelFromListByid(allBrands,b.getId(),Constants.LabelsType.APPLICABLE_BRAND.getKey(),null);
+ if(tb == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝璇烽�夋嫨姝ｇ‘鐨勯�傜敤鍝佺墝");
+ }
+ idsBrand.add("["+b.getId()+"]");
+ if(b.getChildIdList() == null || b.getChildIdList().size() ==0){
+ for(Integer c :b.getChildIdList()){
+ Labels cb = findLabelFromListByid(allBrands,b.getId(),Constants.LabelsType.SERIES_BRAND.getKey(),b.getId());
+ if(cb == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鍝佺墝銆�"+tb.getName() +"銆戜笅鎵�灞炵郴鍒椾笉姝ｇ‘");
+ }
+ idsSerial.add("["+c+"]");
+ }
+ }
+ }
+ goods.setBrandIds(String.join(",",idsBrand));
+ if(idsSerial.size()>0){
+ goods.setSerialIds(String.join(",",idsSerial));
+ }
+ }
+
+ private Labels findLabelFromListByid(List<Labels> allBrands, Integer id, int type,Integer parentId) {
+ if(allBrands == null || allBrands.size() ==0){
+ return null;
+ }
+ for(Labels labels:allBrands){
+ if(!Constants.equalsInteger(id,labels.getId())){
+ return null;
+ }
+ if(!Constants.equalsInteger(type,labels.getType())){
+ return null;
+ }
+ if(parentId !=null && !Constants.equalsInteger(parentId,labels.getParentId())){
+ return null;
+ }
+ return labels;
+ }
+
+ return null;
}
@Override
@@ -216,6 +346,7 @@
@Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateById(Goods goods) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Goods query=goodsMapper.selectById(goods.getId());
@@ -229,7 +360,17 @@
goods.setLabels( StringUtils.removeEnd( goods.getLabels().replace("锛�",","),","));
}
goodsMapper.updateById(goods);
- dealBatchMultiFiles(goods, goods.getFileList(), user);
+ //娓呯┖鍘熸湁鐨剆ku鏁版嵁
+ skuMapper.update(null,new UpdateWrapper<Sku>().lambda()
+ .set(Sku::getIsdeleted,Constants.ONE)
+ .eq(Sku::getIsdeleted,Constants.ZERO)
+ .eq(Sku::getGoodsId,goods.getSkuId()));
+ goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
+ .set(GoodsSku::getIsdeleted,Constants.ONE)
+ .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+ .eq(GoodsSku::getGoodsId,goods.getSkuId()));
+ dealDefaultGoodsSku(goods);//鏂板缓sku淇℃伅
+ dealBatchMultiFiles(goods, goods.getFileList(), user,true);
}
@@ -389,11 +530,14 @@
queryWrapper.eq(Goods::getId,id);
queryWrapper.selectAll(Goods.class);
- queryWrapper.select("(select name from labels where id=t1.parent_id) as categoryName");
- queryWrapper.selectAs(Labels::getName ,Goods::getBrandName);
+ queryWrapper.select("t1.name",Goods::getCategoryName);
+ queryWrapper.select("t2.name" ,Goods::getBrandName);
queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getCategoryId);
+ queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getBrandId);
Goods goods=goodsAdminJoinMapper.selectJoinOne(Goods.class,queryWrapper);
-
+ if(goods == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
Multifile find = new Multifile();
find.setObjId(id);
find.setIsdeleted(Constants.ZERO);
@@ -406,7 +550,64 @@
queryGoodsSku.setIsdeleted(Constants.ZERO);
List<GoodsSku> goodsSkuList=goodsSkuMapper.selectList(new QueryWrapper<>(queryGoodsSku));
goods.setGoodsSkuList(goodsSkuList);
+ if(goodsSkuList.size()>0){
+ //榛樿sku淇℃伅
+ GoodsSku goodsSku = goodsSkuList.get(0);
+ goods.setSkuPrice(goodsSku.getPrice());
+ goods.setWeight(goodsSku.getWeight());
+ goods.setStockNum(goodsSku.getStock());
+ goods.setUnitName(goodsSku.getUnitName());
+ }
+
+ initGoodsApplyBrandAndSerial(goods);
return goods;
+ }
+
+ private void initGoodsApplyBrandAndSerial(Goods goods) {
+ List<Integer> idbrandList = getNumIdByIdsString(goods.getBrandIds());
+ List<Integer> idSerailList = getNumIdByIdsString(goods.getSerialIds());
+ if(idbrandList.size()>0){
+ List<Labels> brandList = new ArrayList<>();
+ List<Integer> allIds = new ArrayList<>();
+ allIds.addAll(idbrandList);
+ if(idSerailList.size()>0){
+ allIds.addAll(idSerailList);
+ }
+ List<Labels> allBrands = labelsMapper.selectList(new QueryWrapper<Labels>().lambda()
+ .in(Labels::getId,allIds)
+ .eq(Labels::getIsdeleted,Constants.ZERO)
+ );
+ for(Integer b : idbrandList){
+ Labels tb = findLabelFromListByid(allBrands,b,Constants.LabelsType.APPLICABLE_BRAND.getKey(),null);
+ if(tb != null){
+ brandList.add(tb);
+ tb.setChildIdList(new ArrayList<>());
+ tb.setChildList(new ArrayList<>());
+ for(Integer c : idSerailList) {
+ Labels cb = findLabelFromListByid(allBrands, c, Constants.LabelsType.SERIES_BRAND.getKey(), b);
+ if (cb != null) {
+ tb.getChildIdList().add(c);
+ tb.getChildList().add(cb);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private List<Integer> getNumIdByIdsString(String brandIds) {
+ List<Integer> idbrandList = new ArrayList<>();
+ if(StringUtils.isNotBlank(brandIds)){
+ String[] idsBrand = brandIds.replace("[","").replace("]", "").split(",");
+ try {
+ for(String s :idsBrand){
+ idbrandList.add(Integer.parseInt(s));
+ }
+ }catch (Exception e){
+
+ }
+ }
+ return idbrandList;
}
@@ -512,8 +713,13 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(Goods.class);
- queryWrapper.selectAs(Labels::getName, Goods::getCategoryName);
- queryWrapper.select("ls.name as parentName ");
+
+ queryWrapper.select("t1.name",Goods::getCategoryName);
+ queryWrapper.select("t2.name" ,Goods::getBrandName);
+ queryWrapper.select("t3.name" ,Goods::getParentName);
+ queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getCategoryId);
+ queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getBrandId);
+ queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getParentCategoryId);
//搴撳瓨閲�
queryWrapper.select("(select sum(STOCK) from goods_sku where ISDELETED=0 and GOODS_ID=t.id) as stockNum ");
//瀹為檯閿�閲�
@@ -522,16 +728,12 @@
" INNER JOIN goodsorder go on go.id=gd.ORDER_ID and go.ISDELETED=0 and go.PAY_STATUS=1 " +
" where gs.GOODS_ID=t.id) as salesVolume ");
- queryWrapper.leftJoin(Labels.class, Labels::getId, Goods::getCategoryId);
- queryWrapper.leftJoin("labels ls on ls.id=t.PARENT_CATEGORY_ID");
-
if (Constants.equalsInteger(pageWrap.getModel().getTabStatus(), Constants.TWO)) {
//宸插敭缃�
queryWrapper.exists("select gs.STOCK from goods_sku gs " +
" INNER JOIN goods g on g.id=gs.GOODS_ID " +
" where gs.STOCK<=0 and gs.ISDELETED=0 and g.id=t.id ");
}
-
queryWrapper.eq(!Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ZERO);
queryWrapper.eq(Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ONE);
@@ -571,32 +773,24 @@
if (list == null || list.size() == 0) {
return;
}
- Multifile multifile=new Multifile();
-
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_FILE).getCode();
- for (Goods model : list) {
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setObjId(model.getId());
- List<Multifile> fileList=multifileMapper.selectList(new QueryWrapper<>(multifile));
- for(Multifile file:fileList){
- if(StringUtils.isNotBlank(file.getFileurl())){
- file.setFileFullUrl(path+file.getFileurl());
- }
- }
- model.setFileList(fileList);
- model.setResourcePath(path);
-
+ for (Goods goods : list) {
+ goods.setResourcePath(path);
//鏌ヨsku
- MPJLambdaWrapper<GoodsSku> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.eq(GoodsSku::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(GoodsSku::getGoodsId,model.getId());
- List<GoodsSku> gsList=goodsSkuMapper.selectList(queryWrapper);
- for(GoodsSku sd:gsList){
- if(StringUtils.isNotBlank(sd.getImgurl())){
- sd.setImgurl(path+sd.getImgurl());
- }
- }
- model.setGoodsSkuList(gsList);
+ MPJLambdaWrapper<GoodsSku> queryWrapper = new MPJLambdaWrapper<GoodsSku>()
+ .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+ .last("limit 1")
+ .eq(GoodsSku::getGoodsId,goods.getId());
+ GoodsSku goodsSku = goodsSkuMapper.selectOne(queryWrapper);
+ goods.setGoodsSkuList(new ArrayList<>());
+ if(goodsSku !=null){
+ goods.getGoodsSkuList().add(goodsSku);
+ //榛樿sku淇℃伅
+ goods.setSkuPrice(goodsSku.getPrice());
+ goods.setWeight(goodsSku.getWeight());
+ goods.setStockNum(goodsSku.getStock());
+ goods.setUnitName(goodsSku.getUnitName());
+ }
}
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 6ca6e1a..ea26131 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -548,11 +548,11 @@
if(goods.getStatus().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鍟嗗搧宸插垹闄ゆ垨宸蹭笅鏋讹紝鏃犳硶涓嬪崟");
}
- if(goodsSku.getStock().compareTo(payDetailRequest.getGoodsNum())<Constants.ZERO){
+ if(goodsSku.getStock().compareTo(new BigDecimal(Constants.formatIntegerNum(payDetailRequest.getGoodsNum())))<Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鍟嗗搧搴撳瓨涓嶈冻锛屾棤娉曚笅鍗曪紒");
}
//鍟嗗搧搴撳瓨鎵ｉ櫎
- goodsSku.setStock(goodsSku.getStock()-payDetailRequest.getGoodsNum());
+ goodsSku.setStock(goodsSku.getStock().subtract(new BigDecimal(Constants.formatIntegerNum(payDetailRequest.getGoodsNum()))));
goodsSkuMapper.updateById(goodsSku);
GoodsorderDetail goodsOrderDetail = new GoodsorderDetail();
goodsOrderDetail.setCreator(member.getId());
@@ -879,7 +879,7 @@
goodsName = goods.getName();
}
if(!Objects.isNull(goodsSku)){
- goodsSku.setStock(goodsSku.getStock()+goodsorderDetail.getGoodsNum());
+ goodsSku.setStock(goodsSku.getStock().add(new BigDecimal(Constants.formatIntegerNum(goodsorderDetail.getGoodsNum()))));
goodsSkuMapper.updateById(goodsSku);
}
}
@@ -1080,7 +1080,7 @@
}
@Override
public void refreshOrderCodes(){
- int countOrder = 0,countSign=0,countSale=0;
+ long countOrder = 0,countSign=0,countSale=0;
QueryWrapper<Goodsorder> order = new QueryWrapper<>();
order.apply(true, "TO_DAYS(NOW())=TO_DAYS(create_date)");
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
index e53c5a4..2f72c64 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java
@@ -269,6 +269,15 @@
queryWrapper.selectAll(Labels.class);
queryWrapper.select("(select name from labels where id=t.PARENT_ID) as parentName");
+ if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.HOMEZHUANQU.getKey())){
+ queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.ZHUANQU_IDS like concat('%[',t.id,']%') ) as goodsNum");
+ }
+ if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.APPLICABLE_BRAND.getKey())){
+ queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.BRAND_IDS like concat('%[',t.id,']%') ) as goodsNum");
+ }
+ if(Constants.equalsInteger(pageWrap.getModel().getType(),Constants.LabelsType.SERIES_BRAND.getKey())){
+ queryWrapper.select("(select count(g.id) from goods g where g.isdeleted=0 and g.SERIAL_IDS like concat('%[',t.id,']%') ) as goodsNum");
+ }
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Labels::getName,pageWrap.getModel().getName());
queryWrapper.eq(pageWrap.getModel().getParentId()!=null,Labels::getParentId,pageWrap.getModel().getParentId());
queryWrapper.eq(pageWrap.getModel().getType()!=null,Labels::getType,pageWrap.getModel().getType());
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
index f474385..b5af21e 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
@@ -67,7 +67,7 @@
//鏌ヨ宸插厬鎹㈡暟閲�
QueryWrapper queryWrapper = new QueryWrapper<MemberCoupon>();
queryWrapper.eq("COUPON_ID",coupon.getId());
- Integer exchangeNum = memberCouponMapper.selectCount(queryWrapper);
+ Long exchangeNum = memberCouponMapper.selectCount(queryWrapper);
if(exchangeNum.compareTo(coupon.getNum()) >= Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紭鎯犲埜宸插厬鎹㈠畬,鏃犳硶鍏戞崲锛�");
}
@@ -179,7 +179,7 @@
}
@Override
- public Integer count(MemberCoupon memberCoupon) {
+ public long count(MemberCoupon memberCoupon) {
QueryWrapper<MemberCoupon> wrapper = new QueryWrapper<>(memberCoupon);
return memberCouponMapper.selectCount(wrapper);
}
@@ -217,8 +217,8 @@
* @return
*/
@Override
- public Integer memberCouponNum( BigDecimal price, Integer memberId,Integer couponType) {
- Integer count = memberCouponMapper.selectCount(new QueryWrapper<MemberCoupon>()
+ public long memberCouponNum( BigDecimal price, Integer memberId,Integer couponType) {
+ long count = memberCouponMapper.selectCount(new QueryWrapper<MemberCoupon>()
.eq("MEMBER_ID",memberId)
.eq("TYPE",Constants.ONE)
.eq("STATUS",Constants.ZERO)
@@ -276,7 +276,7 @@
//鏌ヨ宸插厬鎹㈡暟閲�
QueryWrapper queryWrapper = new QueryWrapper<MemberCoupon>();
queryWrapper.eq("COUPON_ID",couponId);
- Integer exchangeNum = memberCouponMapper.selectCount(queryWrapper);
+ Long exchangeNum = memberCouponMapper.selectCount(queryWrapper);
if(exchangeNum.compareTo(coupon.getNum())>=Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紭鎯犲埜宸插厬鎹㈠畬,鏃犳硶鍏戞崲锛�");
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
index a23bfe5..1d8d942 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/SharesServiceImpl.java
@@ -173,7 +173,7 @@
}
@Override
- public Integer count(Date start, Date end, Integer memberId,List<Integer> objTypes) {
+ public long count(Date start, Date end, Integer memberId,List<Integer> objTypes) {
QueryWrapper<Shares> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(Shares::getMemberId,memberId)
.in(!CollectionUtils.isEmpty(objTypes),Shares::getObjType,objTypes)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopCommentServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopCommentServiceImpl.java
index e258eaa..5de0e9c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopCommentServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopCommentServiceImpl.java
@@ -205,7 +205,7 @@
}
@Override
- public Integer count(Date start, Date end, Integer memberId, Integer type) {
+ public long count(Date start, Date end, Integer memberId, Integer type) {
QueryWrapper<ShopComment> wrapper = new QueryWrapper<>();
wrapper.lambda().eq(ShopComment::getMemberId,memberId)
.eq(Objects.nonNull(type),ShopComment::getType,type)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopFollowServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopFollowServiceImpl.java
index da52fb5..bd97924 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopFollowServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopFollowServiceImpl.java
@@ -176,7 +176,7 @@
}
@Override
- public Integer count(ShopFollow shopFollow) {
+ public long count(ShopFollow shopFollow) {
QueryWrapper<ShopFollow> wrapper = new QueryWrapper<>(shopFollow);
return shopFollowMapper.selectCount(wrapper);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java
index de41157..afd5d8c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopNewsServiceImpl.java
@@ -204,7 +204,7 @@
}
@Override
- public Integer count(ShopNews shopNews) {
+ public long count(ShopNews shopNews) {
QueryWrapper<ShopNews> wrapper = new QueryWrapper<>(shopNews);
return shopNewsMapper.selectCount(wrapper);
}
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index e797e19..bf94f58 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -539,16 +539,16 @@
memberCoupon.setShopId(shopId);
memberCoupon.setType(Constants.ZERO);
memberCoupon.setStatus(Constants.ONE);
- Integer shopCouponUseCount = memberCouponService.count(memberCoupon);
+ long shopCouponUseCount = memberCouponService.count(memberCoupon);
ShopFollow shopFollow = new ShopFollow();
shopFollow.setObjId(shopId);
shopFollow.setObjType(Constants.ZERO);
- Integer shopFansCount = shopFollowService.count(shopFollow);
+ long shopFansCount = shopFollowService.count(shopFollow);
ShopNews shopNews = new ShopNews();
shopNews.setShopId(shopId);
- Integer shopNewCount = shopNewsService.count(shopNews);
+ long shopNewCount = shopNewsService.count(shopNews);
ShopDataStatisticsDTO shopDataStatisticsDTO = new ShopDataStatisticsDTO();
shopDataStatisticsDTO.setShopCouponUseCount(shopCouponUseCount)
.setShopFansCount(shopFansCount).setShopNewCount(shopNewCount);
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ZanServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ZanServiceImpl.java
index c0d77e4..381f7a4 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ZanServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ZanServiceImpl.java
@@ -158,7 +158,7 @@
}
@Override
- public Integer count(Zan zan) {
+ public long count(Zan zan) {
QueryWrapper<Zan> wrapper = new QueryWrapper<>(zan);
return zanMapper.selectCount(wrapper);
}
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
index 61f552d..2d43191 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
@@ -97,7 +97,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "couponType", value = "浼樻儬鍒哥被鍒�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "limitPrice", value = "婊￠", required = true)
})
- public ApiResponse<Integer> memberCouponNum(Integer couponType, BigDecimal limitPrice) {
+ public ApiResponse<Long> memberCouponNum(Integer couponType, BigDecimal limitPrice) {
return ApiResponse.success("鏌ヨ鎴愬姛", memberCouponService.memberCouponNum(limitPrice,getMemberId(),couponType));
}
diff --git a/server/pom.xml b/server/pom.xml
index 95012c9..b32eb1f 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -30,7 +30,7 @@
<swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
<fastjson.version>1.2.70</fastjson.version>
<druid.version>1.2.0</druid.version>
- <mybatis.plus.version>3.4.2</mybatis.plus.version>
+ <mybatis.plus.version>3.5.7</mybatis.plus.version>
<apache.shiro.version>1.7.0</apache.shiro.version>
<oshi.version>5.7.0</oshi.version>
<jna.version>5.7.0</jna.version>
--
Gitblit v1.9.3