From 3a61aa096c3191e97770a92e4e145fe63ddc1aa4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 18:41:05 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java | 4 +
server/dmmall_admin/src/main/java/com/doumee/AdminApplication.java | 2
admin/src/components/business/OperaLabelsFeeAreaWindow.vue | 8 +-
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java | 18 +++--
admin/src/components/business/OperaLabelExpressWindow.vue | 1
server/dmmall_service/src/main/resources/application-dev.yml | 1
admin/src/components/business/OperaCouponWindow.vue | 68 +++++++++++++++-------
server/dmmall_admin/src/main/resources/application.yml | 2
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Coupon.java | 10 +--
admin/src/components/business/OperaNoticeWindow.vue | 10 +--
server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java | 8 ++
admin/src/views/business/memberCoupon.vue | 30 +++++++--
admin/src/views/business/notice.vue | 6 +-
13 files changed, 109 insertions(+), 59 deletions(-)
diff --git a/admin/src/components/business/OperaCouponWindow.vue b/admin/src/components/business/OperaCouponWindow.vue
index 2f1df05..a6649b7 100644
--- a/admin/src/components/business/OperaCouponWindow.vue
+++ b/admin/src/components/business/OperaCouponWindow.vue
@@ -38,14 +38,12 @@
<el-input type="textarea" v-model="form.info" placeholder="璇疯緭鍏ヤ紭鎯犲埜璇存槑" maxlength="500" v-trim/>
</el-form-item>
<p class="tip-header" >浣跨敤闄愬埗</p>
- <el-form-item label="鏈夋晥鏈�" prop="useType">
- <el-radio-group v-model="form.useType">
+ <el-form-item label="鏈夋晥鏈�" prop="getDate">
+ <el-radio-group v-model="form.useType" @change="changeApplyType">
<el-radio :label="0">鍥哄畾鏃舵</el-radio>
<el-radio :label="1">鍥哄畾鏃堕暱</el-radio>
</el-radio-group>
- </el-form-item>
- <el-form-item label="浣跨敤鏃舵" prop="getDate" v-if="form.useType===0">
- <div class="date-style">
+ <div class="date-style" v-if="form.useType===0">
<el-date-picker
v-model="getDate"
type="datetimerange"
@@ -57,9 +55,7 @@
@change="selectDate"
></el-date-picker>
</div>
- </el-form-item>
- <el-form-item label="鍥哄畾鏃堕暱" prop="validDays" v-if="form.useType===1">
- <div class="coupon-rule">
+ <div class="coupon-rule" v-if="form.useType===1">
<div class="discrep">棰嗗姷鍚�</div>
<el-input
v-model="form.validDays"
@@ -72,13 +68,22 @@
</div>
</el-form-item>
<el-form-item label="閫傜敤瀵硅薄" prop="applyType">
- <el-radio-group v-model="form.applyType">
+ <el-radio-group v-model="form.applyType" @change="changeApplyType">
<el-radio :label="0">鍏ㄥ満閫氱敤</el-radio>
<el-radio :label="1">鎸夊搧绫�</el-radio>
<el-radio :label="2">鎸囧畾鍟嗗搧</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item v-if="form.applyType===1" label="閫夋嫨鍝佺被" prop="applyCateIdList" >
+ <el-form-item label="閫夋嫨鍝佺被" prop="applyTypeRule" v-if="form.applyType===1">
+ <el-select style="margin-left:10px;width: 300px;" v-model="form.applyCateIdList" placeholder="璇烽�夋嫨鍟嗗搧鍒嗙被,鏀寔澶氶��" filterable multiple clearable >
+ <el-option v-for="item in categorys" :key="'optCate'+item.id" :label="item.name" :value="item.id"> </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="閫変腑鍟嗗搧" prop="applyTypeRule" v-if="form.applyType===2">
+ <span style="font-size: 12px;color: #216EEE" @click="selectGoods">宸叉寚瀹氥�� {{applyDataList.length}} 銆戜欢鍟嗗搧</span>
+ <el-button style="margin-left:30px;display: inline-block;width: 80px;" type="primary" @click="selectGoods">鍘婚�夋嫨 </el-button>
+ </el-form-item>
+<!-- <el-form-item v-if="form.applyType===1" label="閫夋嫨鍝佺被" prop="applyCateIdList" >
<el-select v-model="form.applyCateIdList" placeholder="璇烽�夋嫨鍟嗗搧鍒嗙被,鏀寔澶氶��" filterable multiple clearable >
<el-option v-for="item in categorys" :key="'optCate'+item.id" :label="item.name" :value="item.id"> </el-option>
</el-select>
@@ -86,7 +91,7 @@
<el-form-item v-if="form.applyType===2" label="閫夋嫨鍟嗗搧" prop="applyIdList" style="display: flex">
<span style="font-size: 12px;color: #216EEE" @click="selectGoods">宸叉寚瀹氥�� {{applyDataList.length}} 銆戜欢鍟嗗搧</span>
<el-button style="margin-left:30px;display: inline-block;width: 80px;" type="primary" @click="selectGoods">鍘婚�夋嫨 </el-button>
- </el-form-item>
+ </el-form-item>-->
<p class="tip-header" >鍙戞斁瑙勫垯</p>
<el-form-item label="鍙戞斁鎬婚噺" prop="num">
<div class="num-style">
@@ -123,10 +128,25 @@
}
}
const getDateRules = (rule, value, callback) => {
- if (!this.form.startDate) {
+ if (!this.form.useType < 0) {
+ callback(new Error('璇烽�夋嫨鏈夋晥鏈�'))
+ } else if (this.form.useType == 1 && !this.form.validDays) {
+ callback(new Error('璇疯緭鍏ュ浐瀹氭椂闀垮ぉ鏁�'))
+ } else if (this.form.useType == 0 && !this.form.startDate) {
callback(new Error('璇烽�夋嫨寮�濮嬫椂闂�'))
- } else if (!this.form.endDate) {
+ } else if (this.form.useType == 0 && !this.form.endDate) {
callback(new Error('璇疯緭鍏ョ粨鏉熸椂闂�'))
+ } else {
+ callback()
+ }
+ }
+ const getApplyTypeRule = (rule, value, callback) => {
+ if (!this.form.applyType < 0) {
+ callback(new Error('璇烽�夋嫨閫傜敤鑼冨洿'))
+ } else if (this.form.applyType == 1 && (!this.form.applyCateIdList || !this.form.applyCateIdList.length)) {
+ callback(new Error('璇烽�夋嫨浣跨敤鍝佺被'))
+ } else if (this.form.applyType == 2 && (!this.form.applyIdList || !this.form.applyIdList.length)) {
+ callback(new Error('璇烽�夋嫨鎸囧畾鍟嗗搧'))
} else {
callback()
}
@@ -187,16 +207,16 @@
],
num: [
{ required: true, validator: numRule, message: '璇疯緭鍏ュ彂鏀炬�绘暟', tigger: 'blur' }
- ]
+ ],
/* integral: [
{ required: true, validator: numRule, message: '璇疯緭鍏ュ厬鎹㈡潯浠�', tigger: 'blur' }
], */
- // validDays: [
- // { required: true, message: '璇疯緭鍏ュ彲鐢ㄦ椂闂�', tigger: 'blur' }
- // ],
- // getDate: [
- // { required: true, validator: getDateRules, tigger: 'change' }
- // ],
+ getDate: [
+ { required: true, validator: getDateRules }
+ ],
+ applyTypeRule: [
+ { required: true, validator: getApplyTypeRule }
+ ]
// shopId: [
// { required: true, validator: numRule, message: '璇烽�夋嫨鍏宠仈搴楅摵', tigger: 'change' }
// ]
@@ -231,6 +251,9 @@
this.applyDataList = res || []
})
},
+ changeApplyType(){
+ this.$refs.form.clearValidate()
+ },
doSelect (rows) {
console.log(rows, this.applyDataList)
this.applyDataList = []
@@ -241,6 +264,7 @@
this.form.applyIdList.push(item.id)
})
}
+ this.$refs.form.clearValidate();
},
open (title, target, type) {
this.showGoods = false
@@ -273,7 +297,9 @@
for (const key in this.form) {
this.form[key] = target[key]
}
- this.getDate = [target.startDate, target.endDate]
+ if (target.startDate && target.endDate) {
+ this.getDate = [target.startDate, target.endDate]
+ }
if (this.form.applyType === 1) {
this.form.applyCateIdList = []
var ta = this.form.applyIds.split(',')
diff --git a/admin/src/components/business/OperaLabelExpressWindow.vue b/admin/src/components/business/OperaLabelExpressWindow.vue
index 7c7913b..d31b009 100644
--- a/admin/src/components/business/OperaLabelExpressWindow.vue
+++ b/admin/src/components/business/OperaLabelExpressWindow.vue
@@ -1,6 +1,7 @@
<template>
<GlobalAlertWindow
:title="title"
+ width="500px"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
diff --git a/admin/src/components/business/OperaLabelsFeeAreaWindow.vue b/admin/src/components/business/OperaLabelsFeeAreaWindow.vue
index 33eccef..184d1c6 100644
--- a/admin/src/components/business/OperaLabelsFeeAreaWindow.vue
+++ b/admin/src/components/business/OperaLabelsFeeAreaWindow.vue
@@ -23,18 +23,18 @@
</el-form-item>
<div style="display: flex">
<el-form-item label="棣栭噸" prop="weight0" style="display: inline-block;flex: 1;">
- <el-input v-model="form.weight0" style="width: 150px" placeholder="璇疯緭鍏ラ閲�" type="number"> <template slot="append" >kg</template> </el-input>
+ <el-input v-model="form.weight0" style="width: 200px" placeholder="璇疯緭鍏ラ閲�" type="number"> <template slot="append" >kg</template> </el-input>
</el-form-item>
<el-form-item label="棣栭噸杩愯垂" prop="fee0" style="display: inline-block;flex: 1;">
- <el-input v-model="form.fee0" style="width: 150px" placeholder="璇疯緭鍏ラ噾棰�" > <template slot="append" >鍏�</template> </el-input>
+ <el-input v-model="form.fee0" style="width: 200px" placeholder="璇疯緭鍏ラ噾棰�" > <template slot="append" >鍏�</template> </el-input>
</el-form-item>
</div>
<div style="display: flex">
<el-form-item label="缁噸" prop="weight1" style="display: inline-block;flex:1">
- <el-input v-model="form.weight1" style="width: 150px" placeholder="璇疯緭鍏ョ画閲�" type="number"> <template slot="append" >kg</template> </el-input>
+ <el-input v-model="form.weight1" style="width: 200px" placeholder="璇疯緭鍏ョ画閲�" type="number"> <template slot="append" >kg</template> </el-input>
</el-form-item>
<el-form-item label="缁噸杩愯垂澧炲姞" prop="fee1" style="display: inline-block;flex: 1;">
- <el-input v-model="form.fee1" style="width: 150px" placeholder="璇疯緭鍏ラ噾棰�" > <template slot="append" >鍏�</template> </el-input>
+ <el-input v-model="form.fee1" style="width: 200px" placeholder="璇疯緭鍏ラ噾棰�" > <template slot="append" >鍏�</template> </el-input>
</el-form-item>
</div>
<el-form-item label="鎺掑簭鐮�" prop="sortnum">
diff --git a/admin/src/components/business/OperaNoticeWindow.vue b/admin/src/components/business/OperaNoticeWindow.vue
index b7766eb..a39efa7 100644
--- a/admin/src/components/business/OperaNoticeWindow.vue
+++ b/admin/src/components/business/OperaNoticeWindow.vue
@@ -6,7 +6,7 @@
@confirm="confirm"
>
<el-form :model="form" ref="form" :rules="rules" label-width="100px" label-suffix="锛�" inline>
-
+
<el-form-item label="鏍囬" prop="title">
<el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" v-trim/>
</el-form-item>
@@ -19,12 +19,12 @@
v-trim
/>
</el-form-item>
- <el-form-item label="閫氱煡瀵硅薄" prop="notifyObject">
+<!-- <el-form-item label="閫氱煡瀵硅薄" prop="notifyObject">
<el-radio-group v-model="form.notifyObject">
<el-radio label="0">鐢ㄦ埛</el-radio>
<el-radio label="1">鍟嗗</el-radio>
</el-radio-group>
- </el-form-item>
+ </el-form-item>-->
</el-form>
</GlobalAlertWindow>
</template>
@@ -38,7 +38,6 @@
components: { GlobalAlertWindow },
data () {
let rule = (rule, value, callBack) => {
- debugger
console.log(rule, value);
callBack()
}
@@ -46,11 +45,10 @@
// 琛ㄥ崟鏁版嵁
form: {
id: null,
-
title: '',
content: '',
notifyObject: '0',
-
+
},
// 楠岃瘉瑙勫垯
rules: {
diff --git a/admin/src/views/business/memberCoupon.vue b/admin/src/views/business/memberCoupon.vue
index 18a6639..a84dbeb 100644
--- a/admin/src/views/business/memberCoupon.vue
+++ b/admin/src/views/business/memberCoupon.vue
@@ -14,11 +14,16 @@
<el-option :key="1" :value="1" label="鎶樻墸鍒�"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="鐘舵��" clearable @change="search" >
+ <el-form-item label="鐘舵��" prop="status" >
+ <el-select v-model="searchForm.status" placeholder="鐘舵��" clearable @change="changeStatus" >
<el-option :value="0" label="鏈娇鐢�"></el-option>
<el-option :value="1" label="宸蹭娇鐢�"></el-option>
- <el-option :value="2" label="宸茶繃鏈�"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏄惁杩囨湡" prop="isexpire" v-if="searchForm.status ===0">
+ <el-select v-model="searchForm.isexpire" placeholder="鐘舵��" clearable @change="search" >
+ <el-option :value="0" label="鏈繃鏈�"></el-option>
+ <el-option :value="1" label="宸茶繃鏈�"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍙戞斁绫诲瀷" prop="getMethod">
@@ -74,9 +79,12 @@
</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>
+ <div v-if="row.status ===0" >
+ <span class="grey" v-if="row.isexpire ===1" >宸茶繃鏈�</span>
+ <span class="green" v-else> 鏈娇鐢�</span>
+ </div>
<span v-else-if="row.status ===1" class="blue"> 宸蹭娇鐢�</span>
- <span v-else class="grey">宸茶繃鏈�</span>
+
</template>
</el-table-column>
<el-table-column prop="useDate" label="浣跨敤鏃堕棿" min-width="100px"></el-table-column>
@@ -112,10 +120,12 @@
nikeName: '',
name: '',
couponType: '',
- status: '',
+ status: null,
+ isexpire: '',
getMethod: '',
orderCode: ''
- }
+ },
+ hiddenexpire: false
}
},
created () {
@@ -126,6 +136,12 @@
'field.main': 'id'
})
this.search()
+ },
+ methods:{
+ changeStatus(){
+ this.searchForm.isexpire=''
+ this.search()
+ }
}
}
</script>
diff --git a/admin/src/views/business/notice.vue b/admin/src/views/business/notice.vue
index 7aad408..eade598 100644
--- a/admin/src/views/business/notice.vue
+++ b/admin/src/views/business/notice.vue
@@ -26,16 +26,16 @@
<el-table-column type="selection" width="55"></el-table-column>
<!-- <el-table-column prop="id" label="涓婚敭" align="center" min-width="100px"></el-table-column> -->
<el-table-column prop="title" label="鏍囬" align="center" min-width="120px"></el-table-column>
- <el-table-column prop="content" label="鍐呭" align="center" min-width="180px"></el-table-column>
+ <el-table-column prop="content" label="鍐呭" align="center" min-width="380px"></el-table-column>
<!-- <el-table-column prop="objMemberId" label="鍏宠仈鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級" min-width="100px"></el-table-column> -->
<!-- <el-table-column prop="objMemberImg" label="鍏宠仈鐢ㄦ埛澶村儚" min-width="100px"></el-table-column> -->
<!-- <el-table-column prop="imgurl" label="鍒楄〃鍥�" min-width="100px"></el-table-column>
<el-table-column prop="objId" label="瀵硅薄缂栫爜" min-width="100px"></el-table-column> -->
- <el-table-column prop="notifyObject" label="閫氱煡瀵硅薄" align="center" min-width="100px">
+<!-- <el-table-column prop="notifyObject" label="閫氱煡瀵硅薄" align="center" min-width="100px">
<template slot-scope="{row}">
{{ row.notifyObject==0 ? '鐢ㄦ埛' : '鍟嗗' }}
</template>
- </el-table-column>
+ </el-table-column>-->
<!-- <el-table-column prop="type" label="娑堟伅绫诲瀷 0璁㈠崟閫氱煡 1绯荤粺娑堟伅 2浜掑姩娑堟伅 3浼樻儬鍒告彁閱� 4瀹樻柟瀹㈡湇 5娲诲姩鎺ㄨ崘 6鎴戠殑鍏虫敞" min-width="100px"></el-table-column> -->
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
<el-table-column prop="creatorName" label="鍒涘缓浜�" align="center" min-width="100px"></el-table-column>
diff --git a/server/dmmall_admin/src/main/java/com/doumee/AdminApplication.java b/server/dmmall_admin/src/main/java/com/doumee/AdminApplication.java
index 5c8a87f..57a1c61 100644
--- a/server/dmmall_admin/src/main/java/com/doumee/AdminApplication.java
+++ b/server/dmmall_admin/src/main/java/com/doumee/AdminApplication.java
@@ -5,6 +5,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext;
+import org.springframework.scheduling.annotation.EnableAsync;
/**
* 鍚姩绫�
@@ -13,6 +14,7 @@
*/
@Slf4j
@SpringBootApplication
+@EnableAsync
@MapperScan("com.doumee.dao")
public class AdminApplication {
diff --git a/server/dmmall_admin/src/main/resources/application.yml b/server/dmmall_admin/src/main/resources/application.yml
index 37078a8..1df4a1a 100644
--- a/server/dmmall_admin/src/main/resources/application.yml
+++ b/server/dmmall_admin/src/main/resources/application.yml
@@ -4,8 +4,6 @@
version: 1.0.0
env: development
# env: production
-
-
spring:
# application:
# name: doumeemes
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 3e73772..09091ee 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
@@ -1,12 +1,9 @@
package com.doumee.dao.business.model;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.*;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -72,16 +69,17 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
-
+ @TableField(fill = FieldFill.UPDATE)
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
-
+ @TableField(fill = FieldFill.UPDATE)
private Date endDate;
@ApiModelProperty(value = "棰嗗彇鍚庢湁鏁堝ぉ鏁�", example = "1")
@ExcelColumn(name="棰嗗彇鍚庢湁鏁堝ぉ鏁�")
+ @TableField(fill = FieldFill.UPDATE)
private Integer validDays;
@ApiModelProperty(value = "棰嗗彇鏂瑰紡 0棰嗗彇 1鍏戞崲", example = "1")
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 c573ce9..ee3f768 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
@@ -146,6 +146,10 @@
@ExcelColumn(name="浼樻儬閲戦锛堝厓锛�",width = 10,index = 7)
@TableField(exist = false)
private BigDecimal couponPrice ;
+ @ApiModelProperty(value = "鏄惁杩囨湡 0鏈繃鏈� 1宸茶繃鏈�", example = "1")
+ @ExcelColumn(name="鏄惁杩囨湡",width = 10,index = 14,valueMapping = "0=鏈繃鏈�;1=宸茶繃鏈�;")
+ @TableField(exist = false)
+ private Integer isexpire;
public static MemberCoupon couponToBean(Coupon coupon, Member member , Date now, Integer getMethod, LoginUserInfo loginUserInfo){
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
index 7a43d37..bdea826 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/CouponServiceImpl.java
@@ -106,6 +106,12 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鍏宠仈鐨勫簵閾轰笉瀛樺湪锛�");
}
}
+ if(coupon.getUseType() ==0){
+ coupon.setValidDays(null);
+ }else{
+ coupon.setStartDate(null);
+ coupon.setEndDate(null);
+ }
coupon.setApplyIds("");
if(Constants.equalsInteger(coupon.getApplyType(),Constants.TWO) && coupon.getApplyIdList()!=null){
coupon.setApplyIds(coupon.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(",")));//浣跨敤瀵硅薄缂栫爜闆嗗悎
@@ -148,7 +154,7 @@
isCreateParamValid(coupon);
Coupon query= couponMapper.selectById(coupon.getId());
initCouponStatus(query);
- /* if(!Constants.equalsInteger(query.getCouponStatus(),Constants.ZERO)){
+ /* if(!Constants.equalsInteger(query.getCouponStatus(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "娲诲姩宸插紑濮�/宸茬粨鏉熺姸鎬侊紝涓嶆敮鎸佺紪杈戞搷浣�");
}*/
coupon.setEditor(user.getId());
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 50aaea8..acf2630 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
@@ -325,16 +325,16 @@
queryWrapper.leftJoin(Goodsorder.class,Goodsorder::getId,MemberCoupon::getOrderId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,MemberCoupon::getCreator);
queryWrapper.eq(MemberCoupon::getIsdeleted, Constants.ZERO);
- if(pageWrap.getModel().getStatus()!=null && pageWrap.getModel().getStatus()!=2){
- queryWrapper.eq(pageWrap.getModel().getStatus()!=null,MemberCoupon::getStatus, pageWrap.getModel().getStatus());
- } else if (pageWrap.getModel().getStatus()!=null && pageWrap.getModel().getStatus()==2) {
- //鏌ヨ宸茶繃鏈�(鏈娇鐢紝鍒囧凡杩囦簡浣跨敤鏈熼檺锛�
- queryWrapper.eq( MemberCoupon::getStatus, Constants.ZERO);
- queryWrapper.lt( MemberCoupon::getEndDate, new Date());
+ if(Constants.equalsInteger(pageWrap.getModel().getStatus(),0)&&pageWrap.getModel().getIsexpire()!=null && pageWrap.getModel().getIsexpire()== 0){
+ queryWrapper.gt( MemberCoupon::getEndDate, new Date());
+ } else if (Constants.equalsInteger(pageWrap.getModel().getStatus(),0)&&pageWrap.getModel().getIsexpire()!=null && pageWrap.getModel().getIsexpire()== 1) {
+ queryWrapper.le( MemberCoupon::getEndDate, new Date());
}
-
queryWrapper.in(pageWrap.getModel().getMethodList()!=null,MemberCoupon::getGetMethod, pageWrap.getModel().getMethodList());
+ queryWrapper.eq(pageWrap.getModel().getStatus()!=null,MemberCoupon::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(pageWrap.getModel().getCouponType()!=null,MemberCoupon::getCouponType, pageWrap.getModel().getCouponType());
queryWrapper.eq(pageWrap.getModel().getCouponId()!=null,MemberCoupon::getCouponId, pageWrap.getModel().getCouponId());
+ queryWrapper.like(pageWrap.getModel().getName()!=null,MemberCoupon::getName, pageWrap.getModel().getName());
queryWrapper.eq(pageWrap.getModel().getOrderCode()!=null,Goodsorder::getCode, pageWrap.getModel().getOrderCode());
queryWrapper.eq(pageWrap.getModel().getGetMethod()!=null,MemberCoupon::getGetMethod, pageWrap.getModel().getGetMethod());
queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNikeName()),ms -> ms.like( Member::getNickname, pageWrap.getModel().getNikeName()).
@@ -349,7 +349,9 @@
&& model.getEndDate()!=null
&& model.getEndDate().before(new Date())){
//宸茶繃鏈�
- model.setStatus(Constants.TWO);
+ model.setIsexpire(Constants.ONE);
+ }else if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
+ model.setIsexpire(Constants.ZERO);
}
}
}
diff --git a/server/dmmall_service/src/main/resources/application-dev.yml b/server/dmmall_service/src/main/resources/application-dev.yml
index 173095b..44ced57 100644
--- a/server/dmmall_service/src/main/resources/application-dev.yml
+++ b/server/dmmall_service/src/main/resources/application-dev.yml
@@ -1,4 +1,3 @@
-
spring:
# 鏁版嵁婧愰厤缃�
datasource:
--
Gitblit v1.9.3