Merge remote-tracking branch 'origin/master'

rk

4 小时以前 4d2dda710968035fa52e69dea47525985674422b

Merge remote-tracking branch 'origin/master'

 admin/src/api/business/inviteRecord.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
import request from '../../utils/request'

// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/business/inviteRecord/page', data, {
    trim: true
  })
}
export function exportExcel (data) {
  return request.post('/business/inviteRecord/exportExcel', data, {
    trim: true,
    download: true
  })
}

 admin/src/components/business/OperaGoodsShopWindow.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,292 @@
<template>
  <GlobalWindow
      :title="title"
      width="100%"
      :visible.sync="visible"
  >
    <TableLayout >
      <!-- æœç´¢è¡¨å• -->
      <el-form ref="searchForm" slot="search-form" :model="searchForm"  label-width="10px" style="display: block;" >
        <el-form-item label="" prop="name" style="display: inline-block;margin-right: 30px;width: 180px">
          <el-input v-model="searchForm.name" placeholder="商品名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="id" style="display: inline-block;margin-right: 30px;;width: 180px">
          <el-input v-model="searchForm.id" placeholder="商品ID" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="" prop="categoryId" style="display: inline-block;margin-right: 30px;">
          <!-- 0正常 1禁用 -->
          <el-select
              v-model="searchForm.categoryId"
              style="width: 120px"
              placeholder="所属分类"
              clearable
              @change="search"
          >
            <el-option
                v-for="item in labels"
                :key="item.id"
                :value="item.id"
                :label="item.name"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="brandId" style="display: inline-block;margin-right: 30px;">
          <!-- 0正常 1禁用 -->
          <el-select
              v-model="searchForm.brandId"
              style="width: 120px"
              placeholder="所属品牌"
              clearable
              @change="search"
          >
            <el-option
                v-for="item in brands"
                :key="item.id"
                :value="item.id"
                :label="item.name"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="status" style="display: inline-block;margin-right: 30px;">
          <!-- 0正常 1禁用 -->
          <el-select
              v-model="searchForm.status"
              style="width: 120px"
              @change="search"
              clearable
              placeholder="上下架状态"
          >
            <el-option :key="0" :value="0" label="上架"></el-option>
            <el-option :key="1" :value="1" label="下架"></el-option>
          </el-select>
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
      <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
      <template v-slot:table-wrap>
<!--        <ul class="toolbar" >
          <li><el-button type="primary" icon="el-icon-plus" @click="setPriceBatch"  >批量定价</el-button></li>
        </ul>-->
        <div :style="'display: flex;height:'+tabelHeight+'px;'">
        <el-table
            :height="tabelHeight"
            v-loading="isWorking.search"
            :data="tableData.list"
            stripe
            border
            @selection-change="handleSelectionChange"
        >
<!--
          <el-table-column type="selection" width="55"></el-table-column>
-->
          <el-table-column prop="imgurl" label="商品信息" min-width="80px">
            <template slot-scope="{row}">
              <el-image style="width: 50px;height: 50px;" v-if="row.imgurl && row.imgurl!=''" :src="row.resourcePath+row.imgurl" :preview-src-list="[row.resourcePath+row.imgurl]"></el-image>
            </template>
          </el-table-column>
          <el-table-column prop="id" label="商品ID" min-width="120px" ></el-table-column>
          <el-table-column prop="name" label="商品名称" min-width="180px" show-overflow-tooltip></el-table-column>
          <el-table-column prop="categoryName" label="所属分类" min-width="120px"></el-table-column>
          <el-table-column prop="brandName" label="所属品牌" min-width="120px"></el-table-column>
          <el-table-column prop="stockNum" label="剩余库存量" min-width="100px"></el-table-column>
          <el-table-column prop="status" label="上下架状态" min-width="100px"   align="center">
            <template slot-scope="{row}">
              <span  v-if="row.status ==1" class="red">已下架</span>
              <span v-else class="green">已上架</span>
            </template>
          </el-table-column>
          <el-table-column prop="price" label="展示价格" min-width="100px" align="center"></el-table-column>
          <el-table-column prop="skuPrice" label="销售价(元)"  fixed="right" min-width="100px" align="center">
            <template slot-scope="{row}">
              <span  class="orange">{{ row.skuPrice }}</span>
            </template>
          </el-table-column>
          <el-table-column prop="shopPrice" label="供货价(元)" align="center" min-width="100px" fixed="right">
            <template slot-scope="scope">
              <el-input v-if="scope.row.isPriceSelected" v-model="scope.row.shopPrice"
                        @focus="focusEvent(scope.row,scope.$index,scope.column)"
                        @blur="blurEvent(scope.row,scope.$index,scope.column)" v-focus></el-input>
              <p style="cursor: pointer" class="blue" title="点击编辑" @click="cellClick(scope.row, scope.column)" v-else>{{scope.row.shopPrice || '未设置' }}</p>
            </template>
          </el-table-column>
<!--          <el-table-column
              label="操作"
              min-width="160"
              fixed="right"
          >
            <template slot-scope="{row}">
              <el-button type="text" v-permissions="['business:goods:update']" @click="setPrice(row)">设置价格</el-button>
            </template>
          </el-table-column>-->
        </el-table>
        <pagination
            @size-change="handleSizeChange"
            @current-change="handlePageChange"
            :pagination="tableData.pagination"
        >
        </pagination>
        </div>
      </template>
    </TableLayout>
    <template  v-slot:footer>
      <el-button @click="visible=false">返回</el-button>
    </template>
  </GlobalWindow>
</template>

<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import { findAll as labelList } from '@/api/business/labels'
import { setGoodsPrice } from '@/api/business/shop'
export default {
  name: 'OperaShopGoodsWindow',
  extends: BaseTable,
  components: { GlobalWindow, TableLayout, Pagination },
  data () {
    return {
      title: '',
      price: null,
      visible: false,
      tabelHeight: null,
      // æœç´¢
      searchForm: {
        id: '',
        name: '',
        shopId: null,
        categoryId: '',
        brandId: '',
        // ç±»åž‹ 0平台商城 1咖豆商城 2咖啡计划商品
        type: '0', // å¹³å°å•†å“
        status: '',
        labels: ''
      },
      labels: [],
      brands: []
    }
  },
  mounted () {
    window.addEventListener('resize', this.handleResize)
  },
  beforeDestroy () {
    window.removeEventListener('resize', this.handleResize)
  },
  created: function () {
    this.config({
      module: '商品信息表',
      api: '/business/goods',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.handleResize()
    labelList({
      type: 0 // å•†å“åˆ†ç±»
    }).then(res => {
      this.labels = res
    })
    labelList({
      type: 1 // å•†å“å“ç‰Œ
    })
      .then(res => {
        this.brands = res
      })
  },
  directives: {
    focus: {
      inserted: function (el) {
        el.querySelector('input').focus()
      }
    }
  },
  methods: {
    setPrice (row) {
      if (row.skuPrice == null) {
        this.$tip.warning('请先设置商品销售价！')
        return
      }
      console.log(row)
    },
    setPriceBatch () {
    },
    handleResize () {
      this.tabelHeight = window.innerHeight - 400
    },
    open (title, info) {
      this.title = title
      this.visible = true
      this.searchForm.shopId = info.id
      this.search()
      this.handleResize()
    },
    handlePageChange: function (pageIndex) {
      this.__checkApi()
      this.tableData.pagination.pageIndex = pageIndex || this.tableData.pagination.pageIndex
      this.isWorking.search = true
      this.api.fetchList({
        page: this.tableData.pagination.pageIndex,
        capacity: this.tableData.pagination.pageSize,
        model: this.searchForm,
        sorts: this.tableData.sorts
      })
        .then(data => {
          (data.records || []).forEach((item) => {
            item.isPriceSelected = false
          })
          this.tableData.list = data.records || []
          this.tableData.pagination.total = data.total
          console.log(this.tableData.list)
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.isWorking.search = false
        })
    },
    cellClick (row, column) {
      row.isPriceSelected = !row.isPriceSelected
    },
    focusEvent (row, index, column) {
      row.oldShopsPrice = row.shopPrice
    },
    blurEvent (row, curIndex, column) {
      if ( !this.skuPrice || this.skuPrice <= row.shopPrice) {
        this.$tip.error('供货价不能低于销售价')
        row.isPriceSelected = !row.isPriceSelected
        row.shopPrice = row.oldShopsPrice// ä»·æ ¼è¿˜åŽŸ
        return
      }
      if (row.shopPrice == row.oldShopsPrice) {
        row.isPriceSelected = !row.isPriceSelected
        return
      }
      setGoodsPrice({
        id: this.searchForm.shopId,
        goodsId: row.id,
        goodsPrice: row.shopPrice
      }).then(res => {
        row.oldShopsPrice = row.shopPrice
        this.$tip.success('修改成功')
        this.$emit('success')
      }).catch(e => {
        row.shopPrice = row.oldShopsPrice// ä»·æ ¼è¿˜åŽŸ
      }).finally(() => {
        row.isPriceSelected = !row.isPriceSelected
      })
    },
    handleClick (val) {
    }
  }
}
</script>
<style scoped>
.table-pagination{
  position: fixed !important;
  bottom: 50px;
}
</style>

 admin/src/views/business/inviteRecord.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
<template>
  <TableLayout :permissions="['business:inviterecord:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="邀请人信息" prop="recName" >
        <el-input v-model="searchForm.recName" placeholder="请邀请人昵称/姓名/手机号 " clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="被邀请人信息" prop="memberName" >
        <el-input v-model="searchForm.memberName" placeholder="被邀请人昵称/姓名/手机号 " clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="完成阶段" prop="firstOrderStatus">
        <el-select  v-model="searchForm.firstOrderStatus"  placeholder="请选择完成阶段"   clearable @change="search" >
          <el-option  :value="0" label="已注册"></el-option>
          <el-option  :value="1" label="完成首单"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:inviterecord:exportExcel']">
        <li> <el-button type="primary" :loading="isWorking.export" v-permissions="['business:inviterecord:exportExcel']" @click="exportExcel">导出</el-button></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
      >
        <el-table-column prop="openid" label="被邀请人微信ID" min-width="200px"></el-table-column>
        <el-table-column prop="memberName" label="被邀请人(昵称/姓名/手机)" min-width="200px"></el-table-column>
        <el-table-column prop="recName" label="邀请人(昵称/姓名/手机)" min-width="200px"></el-table-column>
        <el-table-column prop="firstOrderStatus" label="完成阶段" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.firstOrderStatus ===1" class="green">完成首单</span>
            <span v-else class="orange">已注册</span>
          </template>
        </el-table-column>
        <el-table-column prop="rewardIntegral" label="积分奖励" min-width="100px">
          <template slot-scope="{row}">
           <span class="orange">{{ row.rewardIntegral || ''}}</span>
          </template>
        </el-table-column>
        <el-table-column prop="couponNames" label="优惠券奖励" min-width="150px"></el-table-column>
        <el-table-column prop="firstFinishDate" label="首单完成时间" min-width="150px"></el-table-column>
        <el-table-column prop="createDate" label="注册时间" min-width="150px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      </pagination>
    </template>
  </TableLayout>
</template>

<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
export default {
  name: 'inviteRecord',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
    return {
      // æœç´¢
      searchForm: {
        recName: '',
        memberName: '',
        firstOrderStatus: ''
      }
    }
  },
  created () {
    this.config({
      module: '推荐记录表',
      api: '/business/inviteRecord',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  }
}
</script>

 admin/src/views/business/platformGoods.vue

@@ -2,11 +2,6 @@
  <TableLayout :permissions="['business:goods:query']">
    <!-- æœç´¢è¡¨å• -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<!--      <el-tabs v-model="activeName" @tab-click="handleClick">
        <el-tab-pane label="全部商品" name="first"></el-tab-pane>
        <el-tab-pane label="已售罄商品" name="second"></el-tab-pane>
        <el-tab-pane label="回收站商品" name="third"></el-tab-pane>
      </el-tabs>-->
      <el-form-item label="商品名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入商品名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
@@ -49,6 +44,8 @@
        <el-select
          v-model="searchForm.status"
          placeholder="请选择上架状态"
          clearable
          @change="search"
        >
          <el-option :key="0" :value="0" label="上架"></el-option>
          <el-option :key="1" :value="1" label="下架"></el-option>
@@ -61,10 +58,11 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:goods:create', 'business:goods:delete']">
      <ul class="toolbar" >
        <li><el-button type="primary" icon="el-icon-plus" @click="$refs.operaGoodsWindow.open('新建商品', null, 0)" v-permissions="['business:goods:create']">新建</el-button></li>
        <li><el-button type="primary"  icon="el-icon-edit"  @click="issued(0)">上架</el-button></li>
        <li><el-button type="danger"  icon="el-icon-edit"  @click="issued(1)">下架</el-button></li>
        <li><p class="tip-warn" style="width: 100%;margin-left: 20px;"><i class="el-icon-warning"></i>提示：【供货价设置】只统计启用状态的供销商设置数据</p></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
@@ -87,7 +85,7 @@
        <el-table-column prop="skuPrice" label="销售价(元)" min-width="100px"></el-table-column>
        <el-table-column prop="shopPrice" label="供货价设置" min-width="100px" align="center">
          <template slot-scope="{row}" >
            <div @click="goPriceSet(row)" style="cursor:pointer;"><span  class="red"> {{row.pricedShopNum||0}}</span> / <span class="green"> {{row.shopNum||0}}</span>  </div>
            <div title="针对启用供销商价格设置统计" @click="goPriceSet(row)" style="cursor:pointer;"><span  class="red"> {{row.pricedShopNum||0}}</span> / <span class="green"> {{row.shopNum||0}}</span>  </div>
          </template>
        </el-table-column>
        <el-table-column prop="stockNum" label="剩余库存量" min-width="100px"></el-table-column>
@@ -107,12 +105,12 @@
        </el-table-column>
        <el-table-column
          label="操作"
          min-width="250"
          min-width="160"
          fixed="right"
        >
          <template slot-scope="{row}">
             <el-button type="text" v-if="row.status == 1" @click="$refs.operaGoodsWindow.open('编辑商品', row, 0)" v-permissions="['business:goods:update']">编辑</el-button>
            <el-button type="text"  @click="goPriceSet(row)">供货价</el-button>
            <el-button type="text" v-permissions="['business:goods:update']" @click="goPriceSet(row)">供货价</el-button>
            <el-button type="text" style="color: red;" @click="deleteById(row)" v-permissions="['business:goods:delete']">删除</el-button>
            <!-- <el-button type="text" @click="$refs.operaGoodsDetailWindow.open('商品详情', row, 0)">查看详情</el-button>-->
          </template>
@@ -152,32 +150,17 @@
      // æœç´¢
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        remark: '',
        imgurl: '',
        name: '',
        info: '',
        categoryId: '',
        brandId: '',
        price: '',
        salenum: '',
        content: '',
        sortnum: '',
        looknum: '',
        // ç±»åž‹ 0平台商城 1咖豆商城 2咖啡计划商品
        type: '0', // å¹³å°å•†å“
        status: '',
        isrec: '',
        styleImg: '',
        labels: ''
      },
      labels: [],
      serials: [],
      brands: []
      brands: [],
      serials: []
    }
  },
  provide () {

 admin/src/views/business/shop.vue

@@ -29,9 +29,10 @@
    </el-form>
    <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:delete']">
      <ul class="toolbar" >
        <li><el-button type="primary" @click="$refs.operaShopWindow.open('新建经销商')" icon="el-icon-plus" v-permissions="['business:shop:create']">新建</el-button></li>
        <!-- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:shop:delete']">删除</el-button></li> -->
        <li><p class="tip-warn" style="width: 100%;margin-left: 20px;"><i class="el-icon-warning"></i>提示：【供货价设置】只统计上架状态的商品价格设置数据</p></li>
      </ul>
      <el-table
        v-loading="isWorking.search"
@@ -77,6 +78,11 @@
            {{ row.saleType == 1?'自主采购':'平台铺货'}}
          </template>
        </el-table-column>
        <el-table-column prop="shopPrice" label="供货价设置" min-width="100px" align="center">
          <template slot-scope="{row}" >
            <div title="针对上架商品价格设置统计" @click="goPriceSet(row)" style="cursor:pointer;"><span  class="red"> {{row.pricedGoodsNum||0}}</span> / <span class="green"> {{row.goodsNum||0}}</span>  </div>
          </template>
        </el-table-column>
        <el-table-column prop="createDate" label="创建时间" align="center" min-width="140px"></el-table-column>
        <el-table-column prop="status" label="状态" align="center" min-width="100px" fixed="right">
          <template slot-scope="{row}">
@@ -93,15 +99,15 @@
        <el-table-column
          v-if="containPermissions(['business:shop:update', 'business:shop:delete'])"
          label="操作"
          min-width="200"
          min-width="280"
          fixed="right"
          align="center"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaShopWindow.open('编辑经销商', row)" icon="el-icon-edit" v-permissions="['business:shop:update']">编辑</el-button>
            <el-button type="text" v-permissions="['business:shop:update']" icon="el-icon-edit" @click="goPriceSet(row)">供货价</el-button>
            <el-button type="text" @click="resetPwd(row)" icon="el-icon-edit"  v-permissions="['business:shop:update']">重置密码</el-button>
            <el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:shop:delete']">删除</el-button>

          </template>
        </el-table-column>
      </el-table>
@@ -116,6 +122,7 @@
    <OperaShopWindow ref="operaShopWindow" @success="handlePageChange"/>
    <OperaShopInfoWindow ref="OperaShopInfoWindow" />
    <ResetPwdShopWindow ref="resetPwdWindow"/>
    <OperaGoodsShopWindow ref="OperaGoodsShopWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

@@ -125,12 +132,13 @@
import Pagination from '@/components/common/Pagination'
import OperaShopWindow from '@/components/business/OperaShopWindow'
import OperaShopInfoWindow from '@/components/business/OperaShopInfoWindow'
import OperaGoodsShopWindow from '@/components/business/OperaGoodsShopWindow'
import { resetPwd, updateIsRecById } from '@/api/business/shop'
import ResetPwdShopWindow from '@/components/business/ResetPwdShopWindow'
export default {
  name: 'Shop',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaShopWindow, OperaShopInfoWindow, ResetPwdShopWindow },
  components: { TableLayout, Pagination, OperaShopWindow, OperaShopInfoWindow, ResetPwdShopWindow,OperaGoodsShopWindow },
  data () {
    return {

@@ -154,6 +162,9 @@
    this.search()
  },
  methods: {
    goPriceSet(row){
      this.$refs.OperaGoodsShopWindow.open('设置供货价 - '+row.name, row )
    },
    resetPwd (row) {
      this.$dialog.messageWaring('确认重置该经销商【' + row.name + '】的登录密码吗？')
        .then(() => {

 server/dmmall_admin/src/main/java/com/doumee/api/business/InviteRecordController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
package com.doumee.api.business;

import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;

import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.InviteRecord;
import com.doumee.core.utils.Utils;
import com.doumee.service.business.InviteRecordService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import  com.doumee.api.BaseController;
/**
 * ç”¨æˆ·é‚€è¯·è®°å½•Controller定义
 * @author doumee
 * @date 2026-01-20 15:51:22
 */
@Api(tags = "tableName接口")
@RestController
@RequestMapping("/business/inviteRecord")
public class InviteRecordController extends BaseController {

    @Autowired
    private InviteRecordService inviteRecordService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:inviterecord:create")
    public ApiResponse create(@RequestBody InviteRecord inviteRecord) {
        return ApiResponse.success(inviteRecordService.create(inviteRecord));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:inviterecord:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        inviteRecordService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:inviterecord:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        inviteRecordService.deleteByIdInBatch(this.getIdList(ids));
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:inviterecord:update")
    public ApiResponse updateById(@RequestBody InviteRecord inviteRecord) {
        inviteRecordService.updateById(inviteRecord);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:inviterecord:query")
    public ApiResponse<PageData<InviteRecord>> findPage (@RequestBody PageWrap<InviteRecord> pageWrap) {
        return ApiResponse.success(inviteRecordService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:inviterecord:exportExcel")
    public void exportExcel (@RequestBody PageWrap<InviteRecord> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(InviteRecord.class).export(inviteRecordService.findPage(pageWrap).getRecords(), "会员邀请记录表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:inviterecord:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(inviteRecordService.findById(id));
    }
}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java

@@ -209,5 +209,11 @@
    @TableField(exist = false)
    private Long pricedShopNum;

    @ApiModelProperty(value = "shopId" )
    @TableField(exist = false)
    private Integer shopId;
    @ApiModelProperty(value = "商家供货价" )
    @TableField(exist = false)
    private BigDecimal shopPrice;

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/InviteRecord.java

@@ -30,7 +30,7 @@
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="交易时间" ,index =1,width = 10)
    @ExcelColumn(name="注册时间" ,index =8,width = 10 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
@@ -55,18 +55,22 @@
    private String phone;

    @ApiModelProperty(value = "是否完成首单：0否 1是", example = "1")
    @ExcelColumn(name="完成极端" ,index =4,width = 10,valueMapping = "0=已注册;1=完成首单;")
    private Integer firstOrderStatus;

    @ApiModelProperty(value = "完成首单时间")
    @ExcelColumn(name="完成首单时间" ,index =7,width = 10 ,dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date firstFinishDate;

    @ApiModelProperty(value = "邀请奖励积分")
    @ExcelColumn(name="奖励邀请人积分" ,index =5,width = 10 )
    private BigDecimal rewardIntegral;

    @ApiModelProperty(value = "邀请完成首单奖励优惠券主键 å¤šä¸ªä»¥,分割")
    private String couponIds;

    @ApiModelProperty(value = "邀请完成首单奖励优惠券名称 å¤šä¸ªä»¥,分割")
    @ExcelColumn(name="奖励邀请人优惠券" ,index =6,width = 10 )
    private String couponNames;

    @ApiModelProperty(value = "被邀请人头像")
@@ -75,6 +79,28 @@

    @ApiModelProperty(value = "被邀请人名称")
    @TableField(exist = false)
    @ExcelColumn(name="被邀请人（昵称/姓名/手机号）" ,index =2,width = 20)
    private String memberName;

    @ApiModelProperty(value = "被邀请人名称")
    @TableField(exist = false)
    private String memberNickname;
    @ApiModelProperty(value = "被邀请人手机号")
    @TableField(exist = false)
    private String memberPhone;
    @ApiModelProperty(value = "邀请人昵称")
    @TableField(exist = false)
    private String recNickname;
    @ApiModelProperty(value = "邀请人手机号")
    @TableField(exist = false)
    private String recPhone;
    @ApiModelProperty(value = "被邀请人名称")
    @TableField(exist = false)
    @ExcelColumn(name="邀请人（昵称/姓名/手机号）" ,index =3,width = 20)
    private String recName;
    @ApiModelProperty(value = "被邀请人名称")
    @TableField(exist = false)
    @ExcelColumn(name="被邀请人openid" ,index =1,width = 15)
    private String openid;

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -271,6 +271,12 @@
    @ApiModelProperty(value = "商品编码")
    @TableField(exist = false)
    private Integer  goodsId;
    @ApiModelProperty(value = "已设置价格产品数量")
    @TableField(exist = false)
    private Long  pricedGoodsNum;
    @ApiModelProperty(value = "商品总量")
    @TableField(exist = false)
    private Long  goodsNum;

    @ApiModelProperty(value = "优惠券：优惠券使用总数(å¼ )")
    @TableField(exist = false)

 server/dmmall_service/src/main/java/com/doumee/service/business/InviteRecordService.java

@@ -2,14 +2,9 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Integral;
import com.doumee.dao.web.dto.IntegralDTO;
import com.doumee.dao.web.dto.IntegralRecordDTO;
import com.doumee.dao.web.request.DealIntegralRequest;
import com.doumee.dao.web.response.IntegralDataResponse;
import com.doumee.dao.business.model.InviteRecord;
import com.doumee.dao.web.response.InviteInfoResponse;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -22,5 +17,90 @@
    InviteInfoResponse getInviteInfo(Integer memberId);

    String createShareImg(Integer memberId) throws Exception;


    /**
     * åˆ›å»º
     *
     * @param model å®žä½“对象
     * @return Integer
     */
    Integer create(InviteRecord model);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param model å®žä½“对象
     */
    void delete(InviteRecord model);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param model å®žä½“对象
     */
    void updateById(InviteRecord model);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param model å®žä½“集
     */
    void updateByIdInBatch(List<InviteRecord> model);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return model
     */
    InviteRecord findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param model å®žä½“对象
     * @return InviteRecord
     */
    InviteRecord findOne(InviteRecord model);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param model å®žä½“对象
     * @return List<InviteRecord>
     */
    List<InviteRecord> findList(InviteRecord model);

    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<InviteRecord>
     */
    PageData<InviteRecord> findPage(PageWrap<InviteRecord> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param model å®žä½“对象
     * @return long
     */
    long count(InviteRecord model);

}


 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ActivityServiceImpl.java

@@ -132,7 +132,7 @@
    @Override
    public void deleteById(Integer id) {
        Activity activity = new Activity();
        activity.setIsdeleted(Constants.ZERO);
        activity.setIsdeleted(Constants.ONE);
        activity.setId(id);
        activityMapper.updateById(activity);
    }

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java

@@ -29,6 +29,7 @@
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.bouncycastle.jcajce.provider.asymmetric.GOST;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -56,6 +57,8 @@

    @Autowired
    private GoodsMapper goodsMapper;
    @Autowired
    private ShopGoodsRelationMapper shopGoodsRelationMapper;



@@ -311,6 +314,8 @@
        goods.setEditor(user.getId());
        goods.setId(id);
        goodsMapper.updateById(goods);
        //删除供货价
        shopGoodsRelationMapper.delete(new UpdateWrapper<ShopGoodsRelation>().lambda().eq(ShopGoodsRelation::getGoodsId,id));
    }

    @Override
@@ -329,29 +334,79 @@

    @Override
    public void updateStatusById(List<Goods> list) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();



        for(Goods model:list){
            if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
                MPJLambdaWrapper<Goods> queryWrapper = new MPJLambdaWrapper<>();
                queryWrapper.selectAll(Goods.class);
                queryWrapper.innerJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId);
                queryWrapper.eq(GoodsSku::getIsdeleted,Constants.ZERO);
                queryWrapper.eq(Goods::getId,model.getId());
                List<Goods> query= goodsAdminJoinMapper.selectJoinList(Goods.class,queryWrapper);
                if(query==null||query.size()<=0){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), model.getName()+":商品未配置SKU，无法上架");
                }
            }
            Goods update=new Goods();
            update.setEditor(user.getId());
            update.setEditDate(new Date());
            update.setStatus(model.getStatus());
            update.setId(model.getId());
            goodsMapper.updateById(model);
        if(list == null || list.size()==0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        List<Integer> idList = new ArrayList<>();
        for(Goods model:list){
            idList.add(model.getId() );
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.formatIntegerNum(list.get(0).getStatus()) == Constants.ONE){
            //如果是批量下架
            goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
                    .set(Goods::getEditDate,new Date() )
                    .set(Goods::getEditor,user.getId())
                    .set(Goods::getStatus,Constants.ONE )
                    .in(Goods::getId,idList));
            return;
        }
        long shopNum   = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
                .eq(Shop::getIsdeleted,Constants.ZERO)
                .eq(Shop::getStatus,Constants.ZERO));
        MPJLambdaWrapper<Goods> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Goods.class);
        queryWrapper.select("(select count(s.id) from shop_goods_relation s  " +
                "left join shop g on s.SHOP_ID =g.id " +
                "where g.status=0 and s.ISDELETED=0 and s.GOODS_ID=t.id) as pricedShopNum ");
        queryWrapper.eq(GoodsSku::getIsdeleted,Constants.ZERO);
        queryWrapper.in(Goods::getId,idList);
        List<Goods> goodsList= goodsAdminJoinMapper.selectJoinList(Goods.class,queryWrapper);
        if(goodsList==null || goodsList.size() == 0){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "商品信息查询无效 ");
        }
        //查询全部sku信息
        List<GoodsSku> goodsSkuList=goodsSkuMapper.selectList(new QueryWrapper<GoodsSku>().lambda()
                        .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                        .in(GoodsSku::getGoodsId,idList) );
        if(goodsSkuList==null || goodsSkuList.size() == 0){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "商品尚未设置零售价，请先设置价格！ ");
        }
        for(Goods param: list){
            Goods goods = getGoodsFromListById(param.getId(),goodsList,goodsSkuList);
            if(goods ==null ){
                continue;
            }
            //如果是上架
            goods.setGoodsSkuList(goodsSkuList);
            if(goods.getSkuPrice() == null || goods.getSkuPrice().compareTo(new BigDecimal(0)) <=0){
                //默认sku信息
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), goods.getName()+":商品商品尚未设置零售价，无法上架");
            }
            if(Constants.formatLongNum(goods.getPricedShopNum()) <= shopNum){
                //默认sku信息
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), goods.getName()+":有未设置供货价的经销商，无法上架");
            }
        }
        goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
                .set(Goods::getEditDate,new Date() )
                .set(Goods::getEditor,user.getId())
                .set(Goods::getStatus,Constants.ZERO )
                .in(Goods::getId,idList));
    }

    private Goods getGoodsFromListById(Integer id, List<Goods> goodsList, List<GoodsSku> skuList) {
        for(Goods model: goodsList){
            if(Constants.equalsObject(model.getIdList(),id)){
                for(GoodsSku sku :skuList){
                    if(Constants.equalsInteger(sku.getGoodsId(),id)){
                        model.setSkuPrice(sku.getPrice());
                    }
                }
                return  model;
            }
        }
        return null;
    }


@@ -736,7 +791,11 @@
        queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getParentCategoryId);
        //库存量
        queryWrapper.select("(select sum(STOCK) from goods_sku where ISDELETED=0 and GOODS_ID=t.id) as stockNum ");
        queryWrapper.select("(select count(id) from shop_goods_relation s where s.ISDELETED=0 and s.GOODS_ID=t.id) as pricedShopNum ");
        if(pageWrap.getModel().getShopId() !=null){
            queryWrapper.select("(select  s.price from shop_goods_relation s  where s.ISDELETED=0 and s.GOODS_ID=t.id  and s.shop_id="+pageWrap.getModel().getShopId()+" limit 1) as shopPrice");//商家供货价
        }else{
            queryWrapper.select("(select count(s.id) from shop_goods_relation s  left join shop g on s.SHOP_ID =g.id where g.status=0 and s.ISDELETED=0 and s.GOODS_ID=t.id) as pricedShopNum ");
        }
        //实际销量
        queryWrapper.select("(select sum(gd.GOODS_NUM) from  goodsorder_detail gd" +
                "        inner join  goods_sku gs on gs.id=gd.GOODS_SKU_ID" +
@@ -759,9 +818,12 @@
        queryWrapper.eq(pageWrap.getModel().getBrandId() != null, Goods::getBrandId, pageWrap.getModel().getBrandId());
        queryWrapper.eq(pageWrap.getModel().getStatus() != null, Goods::getStatus, pageWrap.getModel().getStatus());
        queryWrapper.in(pageWrap.getModel().getIdList() != null && pageWrap.getModel().getIdList().size()>0, Goods::getId, pageWrap.getModel().getIdList());
        if(pageWrap.getModel().getShopId() !=null){
            queryWrapper.orderByAsc("shopPrice");
        }
        queryWrapper.orderByDesc(Goods::getId);
        IPage<Goods> result = goodsAdminJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
        initResult(result.getRecords());
        initResult(result.getRecords(),pageWrap.getModel().getShopId()==null);
        return PageData.from(result);
    }

@@ -784,12 +846,16 @@



    private void initResult(List<Goods> list) {
    private void initResult(List<Goods> list,boolean shopId) {
        if (list == null || list.size() == 0) {
            return;
        }
       long shopNum = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
                .eq(Shop::getIsdeleted,Constants.ZERO));
        long shopNum = 0;
        if(shopId){//不针对商家搜索的话，
            shopNum   = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
                    .eq(Shop::getIsdeleted,Constants.ZERO)
                    .eq(Shop::getStatus,Constants.ZERO));
        }
        String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_FILE).getCode();
        for (Goods goods : list) {

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/InviteRecordServiceImpl.java

@@ -34,6 +34,7 @@
import com.doumee.service.business.InviteRecordService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.util.TextUtils;
import org.apache.shiro.SecurityUtils;
@@ -131,10 +132,132 @@

    }

    @Override
    public Integer create(InviteRecord inviteRecord) {
        inviteRecordMapper.insert(inviteRecord);
        return inviteRecord.getId();
    }

    @Override
    public void deleteById(Integer id) {
        inviteRecordMapper.deleteById(id);
    }

    @Override
    public void delete(InviteRecord inviteRecord) {
        UpdateWrapper<InviteRecord> deleteWrapper = new UpdateWrapper<>(inviteRecord);
        inviteRecordMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        inviteRecordMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(InviteRecord inviteRecord) {
        inviteRecordMapper.updateById(inviteRecord);
    }

    @Override
    public void updateByIdInBatch(List<InviteRecord> inviteRecords) {
        if (CollectionUtils.isEmpty(inviteRecords)) {
            return;
        }
        for (InviteRecord inviteRecord: inviteRecords) {
            this.updateById(inviteRecord);
        }
    }

    @Override
    public InviteRecord findById(Integer id) {
        return inviteRecordMapper.selectById(id);
    }

    @Override
    public InviteRecord findOne(InviteRecord inviteRecord) {
        QueryWrapper<InviteRecord> wrapper = new QueryWrapper<>(inviteRecord).last("limit 1");
        return inviteRecordMapper.selectOne(wrapper);
    }

    @Override
    public List<InviteRecord> findList(InviteRecord inviteRecord) {
        QueryWrapper<InviteRecord> wrapper = new QueryWrapper<>(inviteRecord);
        return inviteRecordMapper.selectList(wrapper);
    }

    @Override
    public PageData<InviteRecord> findPage(PageWrap<InviteRecord> pageWrap) {
        IPage<InviteRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<InviteRecord> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(InviteRecord.class )
                .select("t1.name",InviteRecord::getRecName)
                .select("t1.nickname",InviteRecord::getRecNickname)
                .select("t1.phone",InviteRecord::getRecPhone)
                .select("t2.name",InviteRecord::getMemberName)
                .select("t2.nickname",InviteRecord::getMemberNickname)
                .select("t2.open_id",InviteRecord::getOpenid)
                .select("t2.phone",InviteRecord::getMemberPhone)
                .leftJoin(Member.class,Member::getId,InviteRecord::getInviteId)
                .leftJoin(Member.class,Member::getId,InviteRecord::getMemberId) ;
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.eq(pageWrap.getModel().getId() != null,InviteRecord::getId, pageWrap.getModel().getId());
        queryWrapper.eq(pageWrap.getModel().getCreator() != null,InviteRecord::getCreator, pageWrap.getModel().getCreator());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.ge(InviteRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.le(InviteRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        queryWrapper.eq(pageWrap.getModel().getEditor() != null,InviteRecord::getEditor, pageWrap.getModel().getEditor());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.ge(InviteRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.le(InviteRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getRecName()),w->{
            w.like("t1.name",pageWrap.getModel().getRecName()).or()
                    .like("t1.phone",pageWrap.getModel().getRecName()).or()
                    .like("t1.nickname",pageWrap.getModel().getRecName());
        });
        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),w->{
            w.like("t2.name",pageWrap.getModel().getMemberName()).or()
                    .like("t2.phone",pageWrap.getModel().getMemberName()).or()
                    .like("t2.nickname",pageWrap.getModel().getMemberName());
        });
        queryWrapper.eq(pageWrap.getModel().getIsdeleted() != null,InviteRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
        queryWrapper.eq(pageWrap.getModel().getRemark() != null,InviteRecord::getRemark, pageWrap.getModel().getRemark());
        queryWrapper.eq(pageWrap.getModel().getInviteId() != null,InviteRecord::getInviteId, pageWrap.getModel().getInviteId());
        queryWrapper.eq(pageWrap.getModel().getMemberId() != null,InviteRecord::getMemberId, pageWrap.getModel().getMemberId());
        queryWrapper.eq(pageWrap.getModel().getPhone() != null,InviteRecord::getPhone, pageWrap.getModel().getPhone());
        queryWrapper.eq(pageWrap.getModel().getFirstOrderStatus() != null,InviteRecord::getFirstOrderStatus, pageWrap.getModel().getFirstOrderStatus());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.ge(InviteRecord::getFirstFinishDate, Utils.Date.getStart(pageWrap.getModel().getFirstFinishDate()));
            queryWrapper.le(InviteRecord::getFirstFinishDate, Utils.Date.getEnd(pageWrap.getModel().getFirstFinishDate()));
        }
        queryWrapper.eq(pageWrap.getModel().getRewardIntegral() != null,InviteRecord::getRewardIntegral, pageWrap.getModel().getRewardIntegral());

        queryWrapper.orderByDesc(InviteRecord::getCreateDate);
        IPage<InviteRecord> result =inviteRecordMapper.selectPage(page, queryWrapper);
        if(result!=null && result.getRecords()!=null){
            for(InviteRecord model : result.getRecords()){
               model.setMemberName(StringUtils.defaultString(model.getMemberNickname(),"")+" / "
                       +StringUtils.defaultString(model.getMemberName(),"-")+" / "
                       +StringUtils.defaultString(model.getMemberPhone(),"-"));
               model.setRecName(StringUtils.defaultString(model.getRecNickname(),"")+" / "
                       +StringUtils.defaultString(model.getRecName(),"-")+" / "
                       +StringUtils.defaultString(model.getRecPhone(),"-"));
            }
        }
        return PageData.from(result);
    }

    @Override
    public long count(InviteRecord inviteRecord) {
        QueryWrapper<InviteRecord> wrapper = new QueryWrapper<>(inviteRecord);
        return inviteRecordMapper.selectCount(wrapper);
    }




 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java

@@ -206,6 +206,7 @@
        shop.setEditDate(new Date());
        shop.setIsdeleted(Constants.ONE);
        shopMapper.updateById(shop);
        shopGoodsRelationMapper.delete(new UpdateWrapper<ShopGoodsRelation>().lambda().eq(ShopGoodsRelation::getShopId,id));
    }

    @Override
@@ -378,8 +379,9 @@
        queryWrapper.selectAll(Shop.class);
        if(pageWrap.getModel().getGoodsId()!=null){
            //查询某商品的供货价
            queryWrapper.select("(select s.price from shop_goods_relation s where s.ISDELETED=0 and s.shop_id = t.id and s.GOODS_ID="+pageWrap.getModel().getGoodsId()+") as goodsPrice ");
            queryWrapper.select("(select s.price from shop_goods_relation s where s.ISDELETED=0 and s.shop_id = t.id and s.GOODS_ID="+pageWrap.getModel().getGoodsId()+" limit 1) as goodsPrice ");
        }
        queryWrapper.select("(select count(s.id) from shop_goods_relation s left join goods g on s.goods_id =g.id where g.status=0 and s.ISDELETED=0 and s.shop_id=t.id) as pricedGoodsNum ");
        queryWrapper.selectAs(Labels::getName,Shop::getBigAreaName);
        queryWrapper.selectAs(Member::getNickname,Shop::getNickName);
        queryWrapper.selectAs(Member::getImgurl,Shop::getMemberImgurl);
@@ -402,9 +404,13 @@
        IPage<Shop> result = shopJoinMapper.selectJoinPage(page, Shop.class, queryWrapper);
        String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                + systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
        long goodsNum = goodsMapper.selectCount(new QueryWrapper<Goods>().lambda()
                .eq(Goods::getIsdeleted,Constants.ZERO)
                .eq(Goods::getStatus,Constants.ZERO));
        for(Shop model:result.getRecords()){
            model.setImgFullUrl(path);
            model.setAreas( AreasServiceImpl.getAddressByAreaId(model.getAreaId()));
            model.setGoodsNum(goodsNum);
            if(model.getLatitude()!=null && model.getLongitude()!=null){
                model.setLocationInfo(model.getLatitude().doubleValue()+","+model.getLongitude().doubleValue());
            }
@@ -876,12 +882,6 @@
        }
        return  saleReportResponse;
    }







    @Override
    @Transactional