经销商管理

doum

13 小时以前 ad40905455f85a15031af88f03422aec03567ed5

经销商管理

 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) {

 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('操作成功')
        })

 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('操作成功')
        })

 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'

 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('操作成功')
        })

 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('操作成功')
          })

 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('操作成功')
        })

 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('操作成功')
        })

 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('操作成功')
          })

 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;