From 6f846284806e47fac7c2a4a9658473f7f8e9945b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 02 三月 2026 12:10:23 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 2 +-
admin/src/components/business/OperaGoodsOrderDetail.vue | 5 +++--
admin/src/components/business/OperaCouponGoodsWindow.vue | 3 +++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java | 6 ++----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/business/OperaCouponGoodsWindow.vue b/admin/src/components/business/OperaCouponGoodsWindow.vue
index fe62b30..7909c7a 100644
--- a/admin/src/components/business/OperaCouponGoodsWindow.vue
+++ b/admin/src/components/business/OperaCouponGoodsWindow.vue
@@ -108,6 +108,9 @@
// 鎼滅储
searchForm: {
id: '',
+ name:'',
+ categoryId:'',
+ brandId:'',
bindShopId: ''
},
shops: [],
diff --git a/admin/src/components/business/OperaGoodsOrderDetail.vue b/admin/src/components/business/OperaGoodsOrderDetail.vue
index edf1c08..40cf3e4 100644
--- a/admin/src/components/business/OperaGoodsOrderDetail.vue
+++ b/admin/src/components/business/OperaGoodsOrderDetail.vue
@@ -30,10 +30,11 @@
</div>
</div>
<div class="info-item">
- <div class="info-item-a" style="flex: 3">褰掑睘缁忛攢鍟嗭細<span >{{ info.shopName }}</span></div>
+ <div class="info-item-a" style="flex: 1">褰掑睘缁忛攢鍟嗭細<span >{{ info.shopName }}</span></div>
+ <div class="info-item-a" style="flex: 2">瀹㈡埛澶囨敞锛�<span v-if="info.memberInfo" class="red">{{info.memberInfo}}</span></div>
</div>
<div class="info-item">
- <div class="info-item-a" style="flex: 3">澶囨敞锛�<span v-if="info.sysInfo" class="red">{{info.sysInfo}}</span>
+ <div class="info-item-a" style="flex: 3">骞冲彴澶囨敞锛�<span v-if="info.sysInfo" class="red">{{info.sysInfo}}</span>
<span style="margin-left: 20px;" >
<el-button type="text" @click="$refs.operaOrderMarkWindow.open(info.sysInfo && info.sysInfo.length?'缂栬緫澶囨敞':'娣诲姞澶囨敞', info)">
{{ info.sysInfo && info.sysInfo.length?'淇敼澶囨敞':'娣诲姞澶囨敞' }}</el-button>
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
index 8736169..4d8fb43 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java
@@ -163,7 +163,7 @@
insert.setMemberId(member.getId());
insert.setShopId(coupon.getShopId());
insert.setType(coupon.getType());
- insert.setCouponType(coupon.getType());
+ insert.setCouponType(coupon.getCouponType());
insert.setLimitPrice(coupon.getLimitPrice());
insert.setPrice(coupon.getPrice());
if(Constants.equalsObject(coupon.getUseType(),Constants.ZERO)){
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 358916f..e888f69 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
@@ -98,8 +98,7 @@
String ids = "["+labels.getId()+"],";
// goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
// .setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
- if( labels.getApplyIdList()!=null){
- labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
+ if( labels.getApplyIdList()!=null && labels.getApplyIdList().size()>0){
// List<Goods> goods = goodsMapper.selectList(new QueryWrapper<Goods>().lambda().in(Goods::getId,labels.getApplyIdList() ));
goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
.setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
@@ -223,8 +222,7 @@
String ids = "["+labels.getId()+"],";
goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
.setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
- if( labels.getApplyIdList()!=null){
- labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
+ if( labels.getApplyIdList()!=null && labels.getApplyIdList().size()>0){
goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
.setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
.in(Goods::getId,labels.getApplyIdList() ));
--
Gitblit v1.9.3