From c802d5151f9d16d6fbd2a754013e41737362cc00 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Tue, 18 May 2021 18:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E7=B2=89=E8=AE=B0=E5=BD=95=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysImportFanRecordController.java | 17 + .../custom/domain/SysWxSaleAccount.java | 3 + .../custom/mapper/SysWxSaleAccountMapper.java | 7 + .../service/ISysWxSaleAccountService.java | 7 + .../impl/SysCommissionDayServiceImpl.java | 2 +- .../impl/SysWxSaleAccountServiceImpl.java | 9 + .../mapper/custom/SysWxSaleAccountMapper.xml | 15 + stdiet-ui/src/api/custom/importFanRecord.js | 61 ++++ .../ImportFanRecord/ImportFan/index.vue | 120 +++++++ .../views/custom/importFanRecord/index.vue | 336 ++++++++++++++++++ 10 files changed, 576 insertions(+), 1 deletion(-) create mode 100644 stdiet-ui/src/api/custom/importFanRecord.js create mode 100644 stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue create mode 100644 stdiet-ui/src/views/custom/importFanRecord/index.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java index e5add9b71..8d151231f 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java @@ -1,6 +1,9 @@ package com.stdiet.web.controller.custom; import java.util.List; + +import com.stdiet.custom.domain.SysWxSaleAccount; +import com.stdiet.custom.service.ISysWxSaleAccountService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +36,9 @@ public class SysImportFanRecordController extends BaseController @Autowired private ISysImportFanRecordService sysImportFanRecordService; + @Autowired + private ISysWxSaleAccountService sysWxSaleAccountService; + /** * 查询导粉管理列表 */ @@ -100,4 +106,15 @@ public class SysImportFanRecordController extends BaseController { return toAjax(sysImportFanRecordService.deleteSysImportFanRecordByIds(ids)); } + + /** + * 获取可接粉的微信号以及对应销售 + * @param sysWxSaleAccount + * @return + */ + @PreAuthorize("@ss.hasPermi('custom:importFanRecord:add')") + @GetMapping(value = "/getWxAccountAndSale") + public TableDataInfo getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount){ + return getDataTable(sysWxSaleAccountService.getWxAccountAndSale(sysWxSaleAccount)); + } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java index 910ad7eaa..feabbfa5b 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxSaleAccount.java @@ -44,4 +44,7 @@ public class SysWxSaleAccount extends BaseEntity private Integer status; private Integer useCount; + + //销售昵称 + private String saleName; } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java index 7835353f0..0901b5a37 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxSaleAccountMapper.java @@ -71,4 +71,11 @@ public interface SysWxSaleAccountMapper SysWxSaleAccount selectWxAdId(); int insertWxAdLog(SysWxAdLog sysWxAdLog); + + /** + * 获取可接粉的微信号以及分配的销售昵称 + * @param sysWxSaleAccount + * @return + */ + List getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java index 88a4d16fd..5763bf238 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxSaleAccountService.java @@ -72,4 +72,11 @@ public interface ISysWxSaleAccountService String getWxAdId(SysWxAdLog sysWxAdLog); Integer logWxAd(SysWxAdLog sysWxAdLog); + + /** + * 获取可接粉的微信号以及分配的销售昵称 + * @param sysWxSaleAccount + * @return + */ + List getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java index 90aa114ef..be05d3a8c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java @@ -33,7 +33,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService { private SysOrderMapper sysOrderMapper; @Autowired - private SysOrderPauseMapper sysOrderPauseMapper; + private SysOrderPauseMapper sysOrderPauseMapper ; @Autowired private ISysOrderNutritionistReplaceRecordService sysOrderNutritionistReplaceRecordService; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java index e060d7a45..0374d66db 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxSaleAccountServiceImpl.java @@ -128,4 +128,13 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService { public Integer logWxAd(SysWxAdLog sysWxAdLog) { return sysWxSaleAccountMapper.insertWxAdLog(sysWxAdLog); } + + /** + * 获取可接粉的微信号以及分配的销售昵称 + * @param sysWxSaleAccount + * @return + */ + public List getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount){ + return sysWxSaleAccountMapper.getWxAccountAndSale(sysWxSaleAccount); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml index a5ceceaad..e8f32eb8b 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml @@ -19,6 +19,9 @@ + + + @@ -31,6 +34,7 @@ and wx_nick_name like concat('%', #{wxNickName}, '%') and wx_account like concat('%', #{wxAccount}, '%') and wx_phone like concat('%', #{wxPhone}, '%') + and status = #{status} order by id desc @@ -134,4 +138,15 @@ + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/importFanRecord.js b/stdiet-ui/src/api/custom/importFanRecord.js new file mode 100644 index 000000000..68922e69b --- /dev/null +++ b/stdiet-ui/src/api/custom/importFanRecord.js @@ -0,0 +1,61 @@ +import request from '@/utils/request' + +// 查询导粉管理列表 +export function listImportFanRecord(query) { + return request({ + url: '/custom/importFanRecord/list', + method: 'get', + params: query + }) +} + +// 查询导粉管理详细 +export function getImportFanRecord(id) { + return request({ + url: '/custom/importFanRecord/' + id, + method: 'get' + }) +} + +// 新增导粉管理 +export function addImportFanRecord(data) { + return request({ + url: '/custom/importFanRecord', + method: 'post', + data: data + }) +} + +// 修改导粉管理 +export function updateImportFanRecord(data) { + return request({ + url: '/custom/importFanRecord', + method: 'put', + data: data + }) +} + +// 删除导粉管理 +export function delImportFanRecord(id) { + return request({ + url: '/custom/importFanRecord/' + id, + method: 'delete' + }) +} + +// 导出导粉管理 +export function exportImportFanRecord(query) { + return request({ + url: '/custom/importFanRecord/export', + method: 'get', + params: query + }) +} + +export function getWxAccountAndSale(query){ + return request({ + url: '/custom/importFanRecord/getWxAccountAndSale', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue b/stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue new file mode 100644 index 000000000..eb5a9c28c --- /dev/null +++ b/stdiet-ui/src/components/ImportFanRecord/ImportFan/index.vue @@ -0,0 +1,120 @@ + + + + diff --git a/stdiet-ui/src/views/custom/importFanRecord/index.vue b/stdiet-ui/src/views/custom/importFanRecord/index.vue new file mode 100644 index 000000000..fade5a25f --- /dev/null +++ b/stdiet-ui/src/views/custom/importFanRecord/index.vue @@ -0,0 +1,336 @@ + + + \ No newline at end of file