From bb6f2978761f140fedf5db58cf1032202ef54f6f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 16:24:10 +0800
Subject: [PATCH] 经销商管理
---
admin/src/components/business/OperaShopInfoWindow.vue | 56 ++++++++++++++++++++++++++++
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 25 ++++++------
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 3 -
3 files changed, 69 insertions(+), 15 deletions(-)
diff --git a/admin/src/components/business/OperaShopInfoWindow.vue b/admin/src/components/business/OperaShopInfoWindow.vue
index 4cee567..8e42adc 100644
--- a/admin/src/components/business/OperaShopInfoWindow.vue
+++ b/admin/src/components/business/OperaShopInfoWindow.vue
@@ -109,6 +109,62 @@
</TableLayout>
</div>
</template>
+ <template v-else-if="activeGroup == 1">
+ <div style="display: block;margin-bottom: 50px;">
+ <div class="header">
+ <div class="header-b">绉垎鏄庣粏</div>
+ <div class="header-btn">
+ <el-button style="display: inline" type="primary" @click="changeIntegral">绉垎璋冩暣</el-button>
+ </div>
+ </div>
+ <TableLayout >
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <div >
+ <div style="float: left; margin-bottom: 20px;width:50%;">
+ <div class="info-item">
+ <div class="info-item-a">鐜版湁绉垎锛�<span>{{info.integral || 0}}</span></div>
+ <div class="info-item-a">绱绉垎锛�<span>{{info.totalIntegral || 0}}</span></div>
+ </div>
+ </div>
+ <div style="float: right; margin-bottom: 20px;">
+ <el-select v-model="searchForm2.type" placeholder="鍏ㄩ儴" clearable @change="search" style="width: 120px;" >
+ <el-option :key="0" :value="0" label="鑾峰緱" ></el-option>
+ <el-option :key="1" :value="1" label="鎵ｉ櫎" ></el-option>
+ </el-select>
+ <el-button @click="handlePageChange2(1)" type="鐐瑰嚮鍒锋柊" icon="el-icon-refresh" style="margin-left: 10px;" ></el-button>
+ </div>
+ </div>
+ <el-table
+ v-loading="isWorking.search2"
+ :data="tableData2.list"
+ stripe
+ border
+ >
+ <el-table-column prop="type" label="鑾峰緱/鎵ｉ櫎" align="center" min-width="150px">
+ <template slot-scope="{row}">
+ <span v-if="row.type==0" class="green">鑾峰緱</span>
+ <span v-else class="red">鎵ｉ櫎</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="num" label="鏁伴噺" fixed align="center" min-width="100px"> </el-table-column>
+ <el-table-column prop="totalNum" label="浣欓" fixed align="center" min-width="100px"> </el-table-column>
+ <el-table-column prop="strObjType" label="娑堣垂绫诲瀷" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="content" label="鏉ユ簮" align="center" min-width="150px" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" align="center" min-width="200px"></el-table-column>
+ <el-table-column prop="orderCode" label="鍏宠仈璁㈠崟" align="center" min-width="150px"></el-table-column>
+ <el-table-column prop="createDate" label="鍙樺姩鏃堕棿" align="center" min-width="200px"></el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange2"
+ @current-change="handlePageChange2"
+ :pagination="tableData2.pagination"
+ >
+ </pagination>
+ </template>
+ </TableLayout>
+ </div>
+ </template>
<template v-else-if="activeGroup == 2">
<div style="display: block;margin-bottom: 50px;">
<div class="header">
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 0d60570..791411d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -72,7 +72,6 @@
@ApiModelProperty(value = "閭垂閲戦", example = "1")
private BigDecimal mailPrice;
-
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@TableField(exist = false)
@@ -201,7 +200,6 @@
@ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
private Integer distributionShopId;
-
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
@@ -216,7 +214,6 @@
@ApiModelProperty(value = "璁″垝璁㈠崟")
@TableField(exist = false)
private PlanorderDetail planorderDetail;
-
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
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 d468a1c..6ba3cf7 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
@@ -318,24 +318,25 @@
queryWrapper.eq(Shop::getId,id);
queryWrapper.select("(select AVG(SCORE) from shop_comment where ISDELETED=0 and OBJ_ID=t.id) as score");//闂ㄥ簵璇勫垎
/** ----------------start搴楅摵璁块棶鏁版嵁----------------*/
- queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id) as shopTotalVisits");//涓婚〉鎬昏闂噺
- queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id and to_days(CREATE_DATE)=to_days(now()) ) as shopNowVisits");//浠婃棩璁块棶閲�
- queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id and to_days(CREATE_DATE)=to_days(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) ) as shopYesterdayVisits");//鏄ㄦ棩鏃ヨ闂噺
- queryWrapper.select("(select count(s.MEMBER_ID) from (select MEMBER_ID,SHOP_ID from shop_scan where ISDELETED=0 group by MEMBER_ID) as s where s.SHOP_ID = t.id) as shopMemberVisits");//璁块棶鎬荤敤鎴锋暟
+// queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id) as shopTotalVisits");//涓婚〉鎬昏闂噺
+// queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id and to_days(CREATE_DATE)=to_days(now()) ) as shopNowVisits");//浠婃棩璁块棶閲�
+// queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id and to_days(CREATE_DATE)=to_days(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) ) as shopYesterdayVisits");//鏄ㄦ棩鏃ヨ闂噺
+// queryWrapper.select("(select count(s.MEMBER_ID) from (select MEMBER_ID,SHOP_ID from shop_scan where ISDELETED=0 group by MEMBER_ID) as s where s.SHOP_ID = t.id) as shopMemberVisits");//璁块棶鎬荤敤鎴锋暟
/** ----------------end搴楅摵璁块棶鏁版嵁----------------*/
/** ----------------start搴楅摵浜掑姩鏁版嵁----------------*/
- queryWrapper.select("(select count(id) from shop_follow where ISDELETED=0 and OBJ_ID=t.id and OBJ_TYPE=0) as shopFollower");//绮変笣鏁�
- queryWrapper.select("(select count(id) from shop_menu where ISDELETED=0 and SHOP_ID=t.id ) as shopMenu");//鑿滃搧鏁�
- queryWrapper.select("(select count(id) from shop_comment where ISDELETED=0 and OBJ_ID=t.id ) as shopComment");//璇勮鏁�
- queryWrapper.select("(select count(id) from shop_news where ISDELETED=0 and SHOP_ID=t.id ) as shopNews");//鏂伴矞浜�
+// queryWrapper.select("(select count(id) from shop_follow where ISDELETED=0 and OBJ_ID=t.id and OBJ_TYPE=0) as shopFollower");//绮変笣鏁�
+// queryWrapper.select("(select count(id) from shop_menu where ISDELETED=0 and SHOP_ID=t.id ) as shopMenu");//鑿滃搧鏁�
+// queryWrapper.select("(select count(id) from shop_comment where ISDELETED=0 and OBJ_ID=t.id ) as shopComment");//璇勮鏁�
+// queryWrapper.select("(select count(id) from shop_news where ISDELETED=0 and SHOP_ID=t.id ) as shopNews");//鏂伴矞浜�
/** ----------------end搴楅摵浜掑姩鏁版嵁----------------*/
/** ----------------start浼樻儬鍒告暟鎹�----------------*/
- queryWrapper.select("(select count(id) from coupon where ISDELETED=0 and SHOP_ID=t.id and type=0) as couponCount");//浼樻儬鍒稿彂鏀炬�绘暟(寮�)
- queryWrapper.select("(select count(id) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0) as couponDrawCount");//浼樻儬鍒搁鍙栨�绘暟(寮�)
- queryWrapper.select("(select count(id) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0 and STATUS=1 ) as couponUserComment");//浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)
- queryWrapper.select("(select sum(LIMIT_PRICE) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0 and STATUS=1 ) as couponUserMoney");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
+// queryWrapper.select("(select count(id) from coupon where ISDELETED=0 and SHOP_ID=t.id and type=0) as couponCount");//浼樻儬鍒稿彂鏀炬�绘暟(寮�)
+// queryWrapper.select("(select count(id) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0) as couponDrawCount");//浼樻儬鍒搁鍙栨�绘暟(寮�)
+// queryWrapper.select("(select count(id) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0 and STATUS=1 ) as couponUserComment");//浼樻儬鍒镐娇鐢ㄦ�绘暟(寮�)
+// queryWrapper.select("(select sum(LIMIT_PRICE) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0 and STATUS=1 ) as couponUserMoney");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
/** ----------------end搴楅摵浼樻儬鍒告暟鎹�----------------*/
+ queryWrapper.select("(select count(g.id) from goodsorder where g.ISDELETED=0 and g.DISTRIBUTION_SHOP_ID=t.id ) as totalOrderNUm");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
Shop shop= shopJoinMapper.selectJoinOne(Shop.class,queryWrapper);
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
--
Gitblit v1.9.3