From ad40905455f85a15031af88f03422aec03567ed5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 10:22:10 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java | 26 ++++----
admin/src/views/business/labelsBrand.vue | 4
admin/src/api/business/labels.js | 4 +
admin/src/views/business/goodsLabels.vue | 3
admin/src/views/business/labelsYunFee.vue | 4
admin/src/views/business/goodsBrand.vue | 3
admin/src/views/business/labelsBrandSerial.vue | 4
admin/src/views/business/labelsExpress.vue | 3
admin/src/views/business/labelsZhuanqu.vue | 3
admin/src/views/business/integral.vue | 106 +++++++++++++++-------------------
10 files changed, 78 insertions(+), 82 deletions(-)
diff --git a/admin/src/api/business/labels.js b/admin/src/api/business/labels.js
index 44c919c..fafd518 100644
--- a/admin/src/api/business/labels.js
+++ b/admin/src/api/business/labels.js
@@ -19,6 +19,10 @@
export function updateById (data) {
return request.post('/business/labels/updateById', data)
}
+// 淇敼
+export function updateStatusById (data) {
+ return request.post('/business/labels/updateStatusById', data)
+}
// 鍒犻櫎
export function deleteById (id) {
diff --git a/admin/src/views/business/goodsBrand.vue b/admin/src/views/business/goodsBrand.vue
index d1636d8..80b765c 100644
--- a/admin/src/views/business/goodsBrand.vue
+++ b/admin/src/views/business/goodsBrand.vue
@@ -90,6 +90,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaGoodsBrandWindow from '@/components/business/OperaGoodsBrandWindow'
+import {updateStatusById} from "@/api/business/labels";
export default {
name: 'ProductLabel',
extends: BaseTable,
@@ -116,7 +117,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/goodsLabels.vue b/admin/src/views/business/goodsLabels.vue
index 671c545..6101d44 100644
--- a/admin/src/views/business/goodsLabels.vue
+++ b/admin/src/views/business/goodsLabels.vue
@@ -68,6 +68,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaGoodsLabelsWindow from '@/components/business/OperaGoodsLabelsWindow'
+import {updateStatusById} from "@/api/business/labels";
export default {
name: 'ProductLabel',
extends: BaseTable,
@@ -94,7 +95,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/integral.vue b/admin/src/views/business/integral.vue
index 3e3947d..4411132 100644
--- a/admin/src/views/business/integral.vue
+++ b/admin/src/views/business/integral.vue
@@ -2,32 +2,48 @@
<TableLayout :permissions="['business:integral:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鏀舵敮绫诲瀷" prop="type">
- <el-select
- v-model="searchForm.type"
- placeholder="璇烽�夋嫨鏀舵敮绫诲瀷"
- @change="search"
- >
- <el-option :key="0" :value="0" label="鏀跺叆"></el-option>
- <el-option :key="1" :value="1" label="鏀嚭"></el-option>
+ <el-form-item label="鐢ㄦ埛" prop="nickName">
+ <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�/鎴栨墜鏈哄彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鑾峰緱/鎵ｉ櫎" prop="type">
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨鏀舵敮绫诲瀷" @change="search" >
+ <el-option :key="0" :value="0" label="鑾峰緱"></el-option>
+ <el-option :key="1" :value="1" label="鎵ｉ櫎"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐢ㄦ埛鏄电О" prop="nickName">
- <el-input v-model="searchForm.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="骞冲彴璁㈠崟鍙�" prop="orderCode">
+ <el-form-item label="鍏宠仈璁㈠崟鍙�" prop="orderCode">
<el-input v-model="searchForm.orderCode" placeholder="璇疯緭鍏ュ钩鍙拌鍗曞彿" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker
- v-model="createDate"
- type="daterange"
- value-format="yyyy-MM-dd"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- @change="selectDate"
- />
+ <el-form-item label="娑堣垂绫诲瀷" prop="objType">
+ <el-select v-model="searchForm.objType" placeholder="璇烽�夋嫨娑堣垂绫诲瀷" @change="search" >
+ <el-option :key="0" :value="0" label="鑾峰緱"></el-option>
+ <el-option :key="1" :value="1" label="鎵ｉ櫎"></el-option>
+ </el-select>
</el-form-item>
+ <div class="date-style" style="display: inline">
+ <el-form-item label="鍙樺姩鏃堕棿" prop="queryStartDate" >
+ <el-date-picker
+ style="width: 160px"
+ v-model="searchForm.starttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="寮�濮嬫椂闂�"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item label="-" label-width="10px" prop="queryEndDate" >
+ <el-date-picker
+ style="width: 160px"
+ v-model="searchForm.endtime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ placeholder="鎴鏃堕棿"
+ ></el-date-picker>
+ </el-form-item>
+ </div>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button type="primary" :loading="isWorking.export" v-permissions="['business:integral:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>
@@ -43,35 +59,21 @@
border
>
<el-table-column prop="remark" label="娴佹按鍙�" align="center" min-width="100px"></el-table-column>
- <el-table-column label="鐢ㄦ埛" align="center" min-width="100px">
- <template slot-scope="{row}">
- <div style="display: flex; line-height: 50px;">
- <el-image style="with:50px;height:50px;margin-right: 10px;" :scr="row.imgurlfull" :preview-src-list="[row.imgurlfull]"></el-image>
- {{ row.nickName }}
- </div>
- </template>
- </el-table-column>
+ <el-table-column prop="nickName" label="鐢ㄦ埛" align="center" min-width="100px"> </el-table-column>
<el-table-column prop="phone" align="center" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="type" align="center" label="鏀舵敮绫诲瀷" min-width="100px">
<template slot-scope="{row}">
{{ row.type==0?'鏀跺叆':'鏀嚭' }}
</template>
</el-table-column>
- <el-table-column prop="num" align="center" label="鍜栬眴" min-width="100px"></el-table-column>
- <el-table-column prop="totalNum" align="center" label="鍜栬眴浣欓" min-width="100px"></el-table-column>
- <el-table-column prop="type" align="center" label="绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <!-- 0骞冲彴娉ㄥ唽 1绛惧埌 2鍒嗕韩閭�璇� 3閭�璇锋柊鐢ㄦ埛 4鍏戞崲鍟嗗搧 -->
- {{ row.objId==0?'骞冲彴娉ㄥ唽'
- :row.objId==1?'绛惧埌'
- :row.objId==2?'鍒嗕韩閭�璇�'
- :row.objId==3?'閭�璇锋柊鐢ㄦ埛':'鍏戞崲鍟嗗搧'
- }}
- </template>
- </el-table-column>
+ <el-table-column prop="num" align="center" label="鏁伴噺" min-width="100px"></el-table-column>
+<!--
+ <el-table-column prop="totalNum" align="center" label="褰撳墠浣欓" min-width="100px"></el-table-column>
+-->
+ <el-table-column prop="strObjType" align="center" label="娑堣垂绫诲瀷" min-width="100px"></el-table-column>
<el-table-column prop="orderCode" align="center" label="浜ゆ槗鍗曞彿" min-width="100px"></el-table-column>
<el-table-column prop="content" align="center" label="鏀舵敮璇存槑" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" align="center" label="鍙樺姩鏃堕棿" min-width="100px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -96,22 +98,8 @@
createDate: [],
// 鎼滅储
searchForm: {
- id: '',
- creator: '',
- createDate: '',
- editor: '',
- editDate: '',
- isdeleted: '',
- remark: '',
- memberId: '',
- title: '',
- content: '',
- objId: '',
- objType: '',
- type: '',
- num: '',
- totalNum: '',
-
+ nickName: '',
+ userType: 0,
type: '',
starttime: '',
endtime: '',
@@ -127,7 +115,7 @@
'field.main': 'id'
})
this.search()
- },
+ },
methods: {
selectDate(v) {
this.searchForm.starttime = v[0] + '00:00:00'
diff --git a/admin/src/views/business/labelsBrand.vue b/admin/src/views/business/labelsBrand.vue
index 4bf835b..60359d9 100644
--- a/admin/src/views/business/labelsBrand.vue
+++ b/admin/src/views/business/labelsBrand.vue
@@ -73,7 +73,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaLabelsWindow from '@/components/business/OperaLabelsZhuanquWindow'
-import { updateById } from '@/api/business/goods'
+import {updateStatusById} from "@/api/business/labels";
export default {
name: 'Labels',
extends: BaseTable,
@@ -104,7 +104,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/labelsBrandSerial.vue b/admin/src/views/business/labelsBrandSerial.vue
index 8fe7763..65f87a2 100644
--- a/admin/src/views/business/labelsBrandSerial.vue
+++ b/admin/src/views/business/labelsBrandSerial.vue
@@ -84,7 +84,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaLabelsWindow from '@/components/business/OperaLabelsZhuanquWindow'
-import { findAll as labelList } from '@/api/business/labels'
+import {findAll as labelList, updateStatusById} from '@/api/business/labels'
export default {
name: 'Labels',
extends: BaseTable,
@@ -123,7 +123,7 @@
})
},
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/labelsExpress.vue b/admin/src/views/business/labelsExpress.vue
index d5fe258..3f59d51 100644
--- a/admin/src/views/business/labelsExpress.vue
+++ b/admin/src/views/business/labelsExpress.vue
@@ -68,6 +68,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaLabelExpressWindow from '@/components/business/OperaLabelExpressWindow'
+import {updateStatusById} from "@/api/business/labels";
export default {
name: 'ProductLabel',
extends: BaseTable,
@@ -92,7 +93,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/labelsYunFee.vue b/admin/src/views/business/labelsYunFee.vue
index 0c9601f..5e7d17c 100644
--- a/admin/src/views/business/labelsYunFee.vue
+++ b/admin/src/views/business/labelsYunFee.vue
@@ -28,7 +28,7 @@
<el-table-column prop="areas" label="鍖呭惈鍦板尯" min-width="200px" align="center">
<template slot-scope="{row}">
<div v-if="row.areaList && row.areaList.length" >
- <span v-for="item in row.areaList">{{item.name}}锛�> </span>
+ <span v-for="item in row.areaList">{{item.name}}锛�</span>
</div>
</template>
</el-table-column>
@@ -99,7 +99,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
diff --git a/admin/src/views/business/labelsZhuanqu.vue b/admin/src/views/business/labelsZhuanqu.vue
index f89c5ea..647b1d3 100644
--- a/admin/src/views/business/labelsZhuanqu.vue
+++ b/admin/src/views/business/labelsZhuanqu.vue
@@ -74,6 +74,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaLabelsWindow from '@/components/business/OperaLabelsZhuanquWindow'
+import {updateStatusById} from "@/api/business/labels";
export default {
name: 'Labels',
extends: BaseTable,
@@ -104,7 +105,7 @@
},
methods: {
statusChange (row) {
- this.api.updateById({ id: row.id, status: row.status })
+ this.api.updateStatusById({ id: row.id, status: row.status })
.then(() => {
this.$message.success('鎿嶄綔鎴愬姛')
})
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 115c4fb..a85ca8a 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
@@ -856,28 +856,28 @@
* 绉垎绫诲瀷
*/
public enum IntegralObjType {
- REGISTER(0, "骞冲彴娉ㄥ唽", "骞冲彴娉ㄥ唽",0,0),
+ REGISTER(0, "娉ㄥ唽鎴愬姛", "骞冲彴娉ㄥ唽",0,0),
+ INVITENEWUSER(3, "閭�璇峰ソ鍙嬪緱绉垎", "閭�璇峰ソ鍙嬪緱绉垎",0,0),
+ SYSTEM_RECHARGE(12,"绉垎鍙戞斁","绉垎鍙戞斁",0,0),
+ SYSTEM_DEDUCT(13,"绉垎鎵ｉ櫎","绉垎鎵ｉ櫎",0,0),
+ SHOP_ORDER_CANCEL(14,"鍙栨秷璁㈠崟閫�鍥�","鍙栨秷璁㈠崟閫�鍥�",0,0),
+ SHOP_ORDER(9,"涓嬪崟鎶垫墸","涓嬪崟鎶垫墸",1,0),
+ ORDER_DONATE(15,"璁㈠崟璧犻�佺Н鍒�","璁㈠崟璧犻�佺Н鍒�",0,0),
+ ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻閲戦","璁㈠崟缁撶畻閲戦",0,1),
+ WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇",0,1),
+ SHOP_YEAR_SETTLEMENT(18,"绉垎杩囨湡","绉垎杩囨湡",0,0),
+
+ //----------------搴熷純-------start---------
SIGNIN(1, "绛惧埌", "绛惧埌",0,0),
SHARE(2, "鍒嗕韩閭�璇�", "鍒嗕韩閭�璇�",0,0),
- INVITENEWUSER(3, "閭�璇锋柊鐢ㄦ埛", "閭�璇锋柊鐢ㄦ埛",0,0),
EXCHANGEGOODS(4, "鍏戞崲鍟嗗搧", "鍏戞崲鍟嗗搧",1,0),
EXCHANGECOUPON(5, "鍏戞崲浼樻儬鍒�", "鍏戞崲浼樻儬鍒�",1,0),
SHARE_INFO(6,"鍒嗕韩璧勮","鍒嗕韩璧勮",0,0),
POST_COMMENTS(7,"鍙戝竷璇勮","鍙戝竷璇勮",0,0),
COFFEE_MAP_CONSUME(8,"鍜栧暋鍦板浘娑堣垂","鍜栧暋鍦板浘娑堣垂",0,0),
- SHOP_ORDER(9,"绉垎鎶垫墸鍟嗗搧","绉垎鎶垫墸鍟嗗搧",1,0),
AFTERSALE_BACK(10,"鍞悗閫�娆�","鍞悗閫�娆�",1,0),
EXCHANGE_CARD(11,"鍗″厖鍊�","鍗″厖鍊�",0,0),
- SYSTEM_RECHARGE(12,"骞冲彴鍏呭��","骞冲彴鍏呭��",0,0),
- SYSTEM_DEDUCT(13,"骞冲彴鎵ｆ","骞冲彴鎵ｆ",0,0),
- SHOP_ORDER_CANCEL(14,"绉垎鎶垫墸鍟嗗搧閫�杩�","绉垎鎶垫墸鍟嗗搧閫�杩�",0,0),
-
- ORDER_DONATE(15,"璁㈠崟璧犻�佺Н鍒�","璁㈠崟璧犻�佺Н鍒�",0,0),
- ORDER_DONE_AMOUNT(16,"璁㈠崟缁撶畻閲戦","璁㈠崟缁撶畻閲戦",0,1),
-
- WITHDRAW_APPLY(17,"浣欓鎻愮幇","浣欓鎻愮幇",0,1),
-
- SHOP_YEAR_SETTLEMENT(18,"骞村害缁撶畻","骞村害缁撶畻",0,1)
+ //----------------搴熷純------end----------
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3