From 8fe5f041dc11630bfdc36e6698f0dc67616cf91d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 15 一月 2026 10:45:15 +0800
Subject: [PATCH] 经销商管理
---
admin/src/components/common/GlobalWindow.vue | 2 +-
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 8 ++++++--
admin/src/components/business/OperaCouponGoodsWindow.vue | 2 +-
admin/src/views/business/memberCoupon.vue | 6 +++++-
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 1 +
5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/business/OperaCouponGoodsWindow.vue b/admin/src/components/business/OperaCouponGoodsWindow.vue
index fd5a9e3..3bfdb05 100644
--- a/admin/src/components/business/OperaCouponGoodsWindow.vue
+++ b/admin/src/components/business/OperaCouponGoodsWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="80%"
+ width="100%"
:visible.sync="visible"
@confirm="confirm"
>
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 5743aac..64971b8 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -8,7 +8,7 @@
:close-on-press-escape="false"
:wrapper-closable="false"
:append-to-body="true"
- :modal="false"
+ :modal="true"
@close="close"
>
<div slot="title" class="window__header">
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index a8835c4..71f5b44 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -67,7 +67,11 @@
<li> 璧凤細{{ row.startDate}}</li> <li>姝細{{row.endDate }}</li>
</template>
</el-table-column>
- <el-table-column prop="price" label="浼樻儬閲戦(鍏�)" min-width="120px"></el-table-column>
+ <el-table-column prop="couponPrice" label="浼樻儬閲戦(鍏�)" min-width="120px">
+ <template slot-scope="{row}">
+ {{row.status==1?(row.couponPrice||0):'-'}}
+ </template>
+ </el-table-column>
<el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status ===0" class="green"> 鏈娇鐢�</span>
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 6d1486c..5246132 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
@@ -57,8 +57,7 @@
@ApiModelProperty(value = "婊￠锛堝厓锛�", example = "1")
private BigDecimal limitPrice;
- @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
- @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓銆佹姌锛�", example = "1")
private BigDecimal price;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@@ -129,4 +128,9 @@
@TableField(exist = false)
private BigDecimal validAmount;
+ @ApiModelProperty(value = "浼樻儬閲戦锛堝厓锛�", example = "1")
+ @ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
+ @TableField(exist = false)
+ private BigDecimal couponPrice ;
+
}
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 c05162a..ae76be3 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
@@ -177,6 +177,7 @@
queryWrapper.selectAll(MemberCoupon.class);
queryWrapper.selectAs(Member::getNickname,MemberCoupon::getNikeName);
queryWrapper.selectAs(Goodsorder::getCode,MemberCoupon::getOrderCode);
+ queryWrapper.selectAs(Goodsorder::getCouponPrice,MemberCoupon::getCouponPrice);//浼樻儬閲戦
queryWrapper.selectAs(SystemUser::getUsername,MemberCoupon::getCreatorName);
queryWrapper.leftJoin(Member.class,Member::getId,MemberCoupon::getMemberId);
queryWrapper.leftJoin(Goodsorder.class,Goodsorder::getId,MemberCoupon::getOrderId);
--
Gitblit v1.9.3