From 0283eb0a1d63e19ab077eb22dd1dcc7a5e598d46 Mon Sep 17 00:00:00 2001 From: xiezhijun <15270898033@163.com> Date: Thu, 4 Feb 2021 20:12:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AF=BC=E7=B2=89?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/SysWxDistributionController.java | 117 +++++ .../custom/SysWxFanStatisticsController.java | 155 ++++++ .../custom/SysWxSaleAccountController.java | 157 +++--- .../custom/domain/SysCustomerHealthy.java | 6 +- .../custom/domain/SysWxDistribution.java | 66 +++ .../custom/domain/SysWxFanStatistics.java | 64 +++ .../custom/domain/SysWxSaleAccount.java | 118 ++++- .../dto/request/FanStatisticsRequest.java | 25 + .../response/ExportFanStatisticsResponse.java | 28 ++ .../mapper/SysWxDistributionMapper.java | 76 +++ .../mapper/SysWxFanStatisticsMapper.java | 73 +++ .../custom/mapper/SysWxSaleAccountMapper.java | 55 ++- .../service/ISysWxDistributionService.java | 75 +++ .../service/ISysWxFanStatisticsService.java | 85 ++++ .../service/ISysWxSaleAccountService.java | 59 +-- .../impl/SysWxDistributionServiceImpl.java | 115 +++++ .../impl/SysWxFanStatisticsServiceImpl.java | 147 ++++++ .../impl/SysWxSaleAccountServiceImpl.java | 71 ++- .../custom/SysCustomerHealthyMapper.xml | 6 +- .../mapper/custom/SysWxDistributionMapper.xml | 126 +++++ .../custom/SysWxFanStatisticsMapper.xml | 133 ++++++ .../mapper/custom/SysWxSaleAccountMapper.xml | 101 ++-- stdiet-ui/src/api/custom/fanStatistics.js | 65 +++ .../api/custom/{WxAccount.js => wxAccount.js} | 26 +- stdiet-ui/src/api/custom/wxDistribution.js | 53 +++ .../src/components/HealthyForm/Form1.vue | 6 +- .../src/components/HealthyForm/Form4.vue | 4 +- .../components/PhysicalSignsDialog/index.vue | 4 +- .../components/PhysicalSignsEdit/index.vue | 13 +- .../src/views/custom/fanStatistics/index.vue | 449 ++++++++++++++++++ .../custom/subhealthy/investigation/index.vue | 8 +- .../src/views/custom/wxAccount/index.vue | 317 +++++++++++++ .../src/views/custom/wxDistribution/index.vue | 376 +++++++++++++++ 33 files changed, 2923 insertions(+), 256 deletions(-) create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxDistributionController.java create mode 100644 stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxDistribution.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FanStatisticsRequest.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxDistributionMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxDistributionService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxDistributionServiceImpl.java create mode 100644 stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysWxDistributionMapper.xml create mode 100644 stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml create mode 100644 stdiet-ui/src/api/custom/fanStatistics.js rename stdiet-ui/src/api/custom/{WxAccount.js => wxAccount.js} (61%) create mode 100644 stdiet-ui/src/api/custom/wxDistribution.js create mode 100644 stdiet-ui/src/views/custom/fanStatistics/index.vue create mode 100644 stdiet-ui/src/views/custom/wxAccount/index.vue create mode 100644 stdiet-ui/src/views/custom/wxDistribution/index.vue diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxDistributionController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxDistributionController.java new file mode 100644 index 000000000..6d74e10bc --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxDistributionController.java @@ -0,0 +1,117 @@ +package com.stdiet.web.controller.custom; + +import java.util.List; + +import org.aspectj.weaver.loadtime.Aj; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.custom.domain.SysWxDistribution; +import com.stdiet.custom.service.ISysWxDistributionService; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; + +/** + * 微信分配管理Controller + * + * @author xiezhijun + * @date 2021-02-03 + */ +@RestController +@RequestMapping("/custom/wxDistribution") +public class SysWxDistributionController extends BaseController +{ + @Autowired + private ISysWxDistributionService sysWxDistributionService; + + /** + * 查询微信分配管理列表 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:list')") + @GetMapping("/list") + public TableDataInfo list(SysWxDistribution sysWxDistribution) + { + startPage(); + List list = sysWxDistributionService.selectSysWxDistributionList(sysWxDistribution); + return getDataTable(list); + } + + /** + * 导出微信分配管理列表 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:export')") + @Log(title = "微信分配管理", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysWxDistribution sysWxDistribution) + { + List list = sysWxDistributionService.selectSysWxDistributionList(sysWxDistribution); + ExcelUtil util = new ExcelUtil(SysWxDistribution.class); + return util.exportExcel(list, "wxDistribution"); + } + + /** + * 获取微信分配管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysWxDistributionService.selectSysWxDistributionById(id)); + } + + /** + * 新增微信分配管理 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:add')") + @Log(title = "微信分配管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysWxDistribution sysWxDistribution) + { + if(sysWxDistribution.getWechatAccount() != null){ + SysWxDistribution wxIdDistribution = sysWxDistributionService.selectWxDistributionByWxId(sysWxDistribution.getWechatAccount()); + if(wxIdDistribution != null){ + return AjaxResult.error("该微信号已分配，无法重复分配"); + } + } + return toAjax(sysWxDistributionService.insertSysWxDistribution(sysWxDistribution)); + } + + /** + * 修改微信分配管理 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:edit')") + @Log(title = "微信分配管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysWxDistribution sysWxDistribution) + { + if(sysWxDistribution.getWechatAccount() != null){ + SysWxDistribution wxIdDistribution = sysWxDistributionService.selectWxDistributionByWxId(sysWxDistribution.getWechatAccount()); + if(wxIdDistribution != null && wxIdDistribution.getId().intValue() != sysWxDistribution.getId().intValue()){ + return AjaxResult.error("该微信号已分配，无法重复分配"); + } + } + return toAjax(sysWxDistributionService.updateSysWxDistribution(sysWxDistribution)); + } + + /** + * 删除微信分配管理 + */ + @PreAuthorize("@ss.hasPermi('custom:wxDistribution:remove')") + @Log(title = "微信分配管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysWxDistributionService.deleteSysWxDistributionByIds(ids)); + } +} \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java new file mode 100644 index 000000000..921c6cf0e --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxFanStatisticsController.java @@ -0,0 +1,155 @@ +package com.stdiet.web.controller.custom; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.stdiet.common.utils.DateUtils; +import com.stdiet.custom.domain.SysWxDistribution; +import com.stdiet.custom.dto.request.FanStatisticsRequest; +import com.stdiet.custom.dto.response.ExportFanStatisticsResponse; +import com.stdiet.custom.service.ISysWxDistributionService; +import com.stdiet.framework.web.domain.server.Sys; +import org.aspectj.weaver.loadtime.Aj; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.custom.domain.SysWxFanStatistics; +import com.stdiet.custom.service.ISysWxFanStatisticsService; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; + +/** + * 进粉统计Controller + * + * @author xiezhijun + * @date 2021-02-03 + */ +@RestController +@RequestMapping("/custom/fanStatistics") +public class SysWxFanStatisticsController extends BaseController +{ + @Autowired + private ISysWxFanStatisticsService sysWxFanStatisticsService; + + @Autowired + private ISysWxDistributionService sysWxDistributionService; + + /** + * 查询进粉统计列表 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:list')") + @GetMapping("/list") + public TableDataInfo list(SysWxFanStatistics sysWxFanStatistics) + { + startPage(); + List list = sysWxFanStatisticsService.selectSysWxFanStatisticsList(sysWxFanStatistics); + if(list != null && list.size() > 0){ + int totalFanNum = sysWxFanStatisticsService.selectFanNumCount(sysWxFanStatistics); + list.get(0).setTotalFanNum(totalFanNum); + } + return getDataTable(list); + } + + /** + * 导出进粉统计列表 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:export')") + @Log(title = "进粉统计", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysWxFanStatistics sysWxFanStatistics) + { + sysWxFanStatistics.setSortFlag(1); + List list = sysWxFanStatisticsService.selectSysWxFanStatisticsList(sysWxFanStatistics); + List responsesList = new ArrayList<>(); + ExportFanStatisticsResponse exportFanStatisticsResponse = null; + int groupId = 0; + int index = 0; + int totalFanNum = 0; + for(SysWxFanStatistics sysWxFan : list){ + int wxGroupId = sysWxFan.getSaleGroupId() != null ? sysWxFan.getSaleGroupId().intValue() : 0; + if(wxGroupId != groupId && groupId != 0){ + responsesList.add(new ExportFanStatisticsResponse()); + index = 0; + } + groupId = wxGroupId; + exportFanStatisticsResponse = new ExportFanStatisticsResponse(); + exportFanStatisticsResponse.setId(++index); + exportFanStatisticsResponse.setAccount(sysWxFan.getAccount()); + exportFanStatisticsResponse.setSaleName(sysWxFan.getUserName()); + exportFanStatisticsResponse.setWxAccount(sysWxFan.getWxAccount()); + exportFanStatisticsResponse.setFanNum(sysWxFan.getFanNum()); + responsesList.add(exportFanStatisticsResponse); + totalFanNum += exportFanStatisticsResponse.getFanNum().intValue(); + } + responsesList.add(new ExportFanStatisticsResponse()); + ExportFanStatisticsResponse total = new ExportFanStatisticsResponse(); + total.setWxAccount("总计进粉量"); + total.setFanNum(totalFanNum); + responsesList.add(total); + ExcelUtil util = new ExcelUtil(ExportFanStatisticsResponse.class); + return util.exportExcel(responsesList, DateUtils.getDate()); + } + + /** + * 获取进粉统计详细信息 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysWxFanStatisticsService.selectSysWxFanStatisticsById(id)); + } + + /** + * 新增进粉统计 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:add')") + @Log(title = "进粉统计", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody FanStatisticsRequest fanStatisticsRequest) + { + return sysWxFanStatisticsService.addWxFanNum(fanStatisticsRequest); + } + + /** + * 修改进粉统计 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:edit')") + @Log(title = "进粉统计", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysWxFanStatistics sysWxFanStatistics) + { + List wxIdFanStatistics = sysWxFanStatisticsService.getWxFanStatisticsByUserIdAndFanTime(sysWxFanStatistics); + System.out.println(wxIdFanStatistics.size()); + if(wxIdFanStatistics != null && wxIdFanStatistics.size() > 0 && sysWxFanStatistics.getId().intValue() != wxIdFanStatistics.get(0).getId().intValue()){ + return AjaxResult.error("当前日期、微信号下已存在进粉记录"); + } + return toAjax(sysWxFanStatisticsService.updateSysWxFanStatistics(sysWxFanStatistics)); + } + + /** + * 删除进粉统计 + */ + @PreAuthorize("@ss.hasPermi('custom:fanStatistics:remove')") + @Log(title = "进粉统计", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysWxFanStatisticsService.deleteSysWxFanStatisticsByIds(ids)); + } + + /** + * 获取当前用户被分配的微信号 + */ + @RequestMapping("/getWxByUserId") + public AjaxResult getWxByUserId(@RequestParam("userId")Long userId){ + List list = sysWxDistributionService.selectDistributionWxByUserId(userId); + return AjaxResult.success(list); + } +} diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java index e0a93860b..5eeaeb636 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxSaleAccountController.java @@ -1,140 +1,127 @@ package com.stdiet.web.controller.custom; +import java.util.List; + +import com.stdiet.common.utils.StringUtils; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import com.stdiet.common.annotation.Log; -import com.stdiet.common.config.RuoYiConfig; import com.stdiet.common.core.controller.BaseController; import com.stdiet.common.core.domain.AjaxResult; -import com.stdiet.common.core.page.TableDataInfo; -import com.stdiet.common.core.redis.RedisCache; import com.stdiet.common.enums.BusinessType; -import com.stdiet.common.utils.StringUtils; -import com.stdiet.common.utils.file.FileUploadUtils; -import com.stdiet.common.utils.poi.ExcelUtil; import com.stdiet.custom.domain.SysWxSaleAccount; -import com.stdiet.custom.domain.wechat.WxAccessToken; -import com.stdiet.custom.domain.wechat.WxFileUploadResult; import com.stdiet.custom.service.ISysWxSaleAccountService; -import com.stdiet.custom.utils.WxTokenUtils; -import com.stdiet.framework.config.ServerConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; -import java.util.concurrent.TimeUnit; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; /** - * 微信销售账号Controller + * 微信账号Controller * - * @author wonder - * @date 2021-01-29 + * @author xiezhijun + * @date 2021-02-03 */ @RestController -@RequestMapping("/custom/WxAccount") -public class SysWxSaleAccountController extends BaseController { +@RequestMapping("/custom/wxAccount") +public class SysWxSaleAccountController extends BaseController +{ @Autowired private ISysWxSaleAccountService sysWxSaleAccountService; - @Autowired - private RedisCache redisCache; - - @Autowired - private ServerConfig serverConfig; - /** - * 查询微信销售账号列表 + * 查询微信账号列表 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:list')") + @PreAuthorize("@ss.hasPermi('custom:wxAccount:list')") @GetMapping("/list") - public TableDataInfo list(SysWxSaleAccount sysWxSaleAccount) { + public TableDataInfo list(SysWxSaleAccount sysWxSaleAccount) + { startPage(); List list = sysWxSaleAccountService.selectSysWxSaleAccountList(sysWxSaleAccount); return getDataTable(list); } /** - * 导出微信销售账号列表 + * 导出微信账号列表 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:export')") - @Log(title = "微信销售账号", businessType = BusinessType.EXPORT) + @PreAuthorize("@ss.hasPermi('custom:wxAccount:export')") + @Log(title = "微信账号", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(SysWxSaleAccount sysWxSaleAccount) { + public AjaxResult export(SysWxSaleAccount sysWxSaleAccount) + { List list = sysWxSaleAccountService.selectSysWxSaleAccountList(sysWxSaleAccount); ExcelUtil util = new ExcelUtil(SysWxSaleAccount.class); - return util.exportExcel(list, "WxAccount"); + return util.exportExcel(list, "wxAccount"); } /** - * 获取微信销售账号详细信息 + * 获取微信账号详细信息 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:query')") + @PreAuthorize("@ss.hasPermi('custom:wxAccount:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { + public AjaxResult getInfo(@PathVariable("id") Long id) + { return AjaxResult.success(sysWxSaleAccountService.selectSysWxSaleAccountById(id)); } /** - * 新增微信销售账号 + * 新增微信账号 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:add')") - @Log(title = "微信销售账号", businessType = BusinessType.INSERT) + @PreAuthorize("@ss.hasPermi('custom:wxAccount:add')") + @Log(title = "微信账号", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody SysWxSaleAccount sysWxSaleAccount) { + public AjaxResult add(@RequestBody SysWxSaleAccount sysWxSaleAccount) + { + if(StringUtils.isNotEmpty(sysWxSaleAccount.getWxAccount())){ + if(sysWxSaleAccountService.selectWxAccountByAccountOrPhone(sysWxSaleAccount.getWxAccount(), 0) != null){ + return AjaxResult.error("微信号已存在，无法重复添加"); + } + } + if(StringUtils.isNotEmpty(sysWxSaleAccount.getWxPhone())){ + if(sysWxSaleAccountService.selectWxAccountByAccountOrPhone(sysWxSaleAccount.getWxPhone(), 1) != null){ + return AjaxResult.error("手机号已存在，无法重复添加"); + } + } return toAjax(sysWxSaleAccountService.insertSysWxSaleAccount(sysWxSaleAccount)); } /** - * 修改微信销售账号 + * 修改微信账号 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:edit')") - @Log(title = "微信销售账号", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('custom:wxAccount:edit')") + @Log(title = "微信账号", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody SysWxSaleAccount sysWxSaleAccount) { + public AjaxResult edit(@RequestBody SysWxSaleAccount sysWxSaleAccount) + { + if(StringUtils.isNotEmpty(sysWxSaleAccount.getWxAccount())){ + SysWxSaleAccount accountWx = sysWxSaleAccountService.selectWxAccountByAccountOrPhone(sysWxSaleAccount.getWxAccount(), 0); + if(accountWx != null && accountWx.getId().intValue() != sysWxSaleAccount.getId().intValue()){ + return AjaxResult.error("微信号已存在，无法修改"); + } + } + if(StringUtils.isNotEmpty(sysWxSaleAccount.getWxPhone())){ + SysWxSaleAccount accountWx = sysWxSaleAccountService.selectWxAccountByAccountOrPhone(sysWxSaleAccount.getWxPhone(), 1); + if(accountWx != null && accountWx.getId().intValue() != sysWxSaleAccount.getId().intValue()){ + return AjaxResult.error("手机号已存在，无法修改"); + } + } return toAjax(sysWxSaleAccountService.updateSysWxSaleAccount(sysWxSaleAccount)); } /** - * 删除微信销售账号 + * 删除微信账号 */ - @PreAuthorize("@ss.hasPermi('custom:WxAccount:remove')") - @Log(title = "微信销售账号", businessType = BusinessType.DELETE) + @PreAuthorize("@ss.hasPermi('custom:wxAccount:remove')") + @Log(title = "微信账号", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { + public AjaxResult remove(@PathVariable Long[] ids) + { return toAjax(sysWxSaleAccountService.deleteSysWxSaleAccountByIds(ids)); } - - /** - * 通用上传请求(无需登录认证) - */ - @PostMapping("/upload") - public AjaxResult wxAccountUpload(MultipartFile file) throws Exception { - try { - // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); - // 上传并返回新文件名称 - String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + fileName; - - String accessToken = redisCache.getCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN); - if (StringUtils.isEmpty(accessToken)) { - WxAccessToken wxAccessToken = WxTokenUtils.fetchAccessToken(); - redisCache.setCacheObject(WxTokenUtils.KEY_ACCESS_TOKEN, wxAccessToken.getAccessToken(), wxAccessToken.getExpiresIn(), TimeUnit.SECONDS); - } - - WxFileUploadResult result = WxTokenUtils.uploadImage(filePath, accessToken); - if (result == null) { - return AjaxResult.error("上传微信失败"); - } - - AjaxResult ajax = AjaxResult.success(); - ajax.put("fileName", fileName); - ajax.put("mediaId", result.getMediaId()); - ajax.put("url", url); - return ajax; - } catch (Exception e) { - return AjaxResult.error(e.getMessage()); - } - } - } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java index bac140cd5..21052d9f8 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java @@ -4,6 +4,7 @@ import lombok.Data; import com.stdiet.common.annotation.Excel; import com.stdiet.common.core.domain.BaseEntity; +import java.math.BigDecimal; import java.util.List; /** @@ -57,7 +58,7 @@ public class SysCustomerHealthy extends BaseEntity /** 体重 */ @Excel(name = "体重") - private Long weight; + private BigDecimal weight; /** 调味品种类，使用 , 隔开 */ @Excel(name = "调味品种类，使用 , 隔开") @@ -429,6 +430,9 @@ public class SysCustomerHealthy extends BaseEntity @Excel(name = "气血数据") private String bloodData; + //备注 + private String remark; + /** 湿气数据 */ @Excel(name = "湿气数据") private String moistureDate; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxDistribution.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxDistribution.java new file mode 100644 index 000000000..a0b34173b --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxDistribution.java @@ -0,0 +1,66 @@ +package com.stdiet.custom.domain; + +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 微信分配管理对象 sys_wx_distribution + * + * @author xiezhijun + * @date 2021-02-03 + */ +@Data +public class SysWxDistribution extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 后台用户id + */ + private Long userId; + + @Excel(name = "销售") + private String userName; + + /** + * 字典表中销售小组对应键值 + */ + private Integer saleGroupId; + + @Excel(name = "销售组别") + private String saleGroup; + + /** + * 字典表中账号对应键值 + */ + private Integer accountId; + + @Excel(name = "收款账号") + private String account; + + /** + * 微信账号id + */ + private Long wechatAccount; + + @Excel(name = "微信昵称") + private String wxNickName; + + @Excel(name = "微信号") + private String wxAccount; + + /** + * 微信账号类型，0接粉号 1新号，默认0 + */ + private Integer wechatAccountType; + + /** + * 删除标识 0未删除 1已删除，默认0 + */ + private Integer delFlag; +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java new file mode 100644 index 000000000..c92392aaa --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java @@ -0,0 +1,64 @@ +package com.stdiet.custom.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 进粉统计对象 sys_wx_fan_statistics + * + * @author xiezhijun + * @date 2021-02-03 + */ +@Data +public class SysWxFanStatistics extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + @Excel(name = "销售") + private String userName; + + //销售ID + private Long userId; + + @Excel(name = "进粉账号") + private String account; + + //销售组别 + private String saleGroup; + + /** 微信号ID */ + private Long wxId; + + @Excel(name = "微信昵称") + private String wxNickName; + + @Excel(name = "微信号") + private String wxAccount; + + /** 进粉时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "进粉时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date fanTime; + + /** 进粉个数 */ + @Excel(name = "进粉个数") + private Integer fanNum; + + /** 删除标识 0未删除 1已删除，默认0 */ + private Integer delFlag; + + //进粉总数量 + private Integer totalFanNum; + + //销售组别ID + private Integer saleGroupId; + + //排序参数，null或者0：按照id倒序 1：按照组别ID、id顺序正序 + private Integer sortFlag; +} \ No newline at end of file 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 a034f8638..1bfdb4340 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 @@ -1,18 +1,16 @@ package com.stdiet.custom.domain; -import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.stdiet.common.annotation.Excel; import com.stdiet.common.core.domain.BaseEntity; /** - * 微信销售账号对象 sys_wx_sale_account - * - * @author wonder - * @date 2021-01-29 + * 微信账号对象 sys_wx_sale_account + * + * @author xiezhijun + * @date 2021-02-03 */ -@Data public class SysWxSaleAccount extends BaseEntity { private static final long serialVersionUID = 1L; @@ -20,28 +18,106 @@ public class SysWxSaleAccount extends BaseEntity /** $column.columnComment */ private Long id; - /** 账号名称 */ - @Excel(name = "账号名称") - private String nickName; - - /** 账号id */ - @Excel(name = "账号id") - private Long accountId; + /** 微信昵称 */ + @Excel(name = "微信昵称") + private String wxNickName; /** 微信号 */ @Excel(name = "微信号") - private String wxId; + private String wxAccount; - /** 手机号 */ - @Excel(name = "手机号") - private String phone; + /** 微信手机号 */ + @Excel(name = "微信手机号") + private String wxPhone; - private String imgUrl; + /** 二维码图片 */ + private String wxCodeUrl; - private String mediaId; + /** 微信类型 */ + private Integer wxType; - private String remark; + /** 删除标识 0未删除 1已删除，默认0 */ + private Integer delFlag; - private Integer count; + public void setId(Long id) + { + this.id = id; + } + public Long getId() + { + return id; + } + public void setWxNickName(String wxNickName) + { + this.wxNickName = wxNickName; + } + + public String getWxNickName() + { + return wxNickName; + } + public void setWxAccount(String wxAccount) + { + this.wxAccount = wxAccount; + } + + public String getWxAccount() + { + return wxAccount; + } + public void setWxPhone(String wxPhone) + { + this.wxPhone = wxPhone; + } + + public String getWxPhone() + { + return wxPhone; + } + public void setWxCodeUrl(String wxCodeUrl) + { + this.wxCodeUrl = wxCodeUrl; + } + + public String getWxCodeUrl() + { + return wxCodeUrl; + } + public void setWxType(Integer wxType) + { + this.wxType = wxType; + } + + public Integer getWxType() + { + return wxType; + } + public void setDelFlag(Integer delFlag) + { + this.delFlag = delFlag; + } + + public Integer getDelFlag() + { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("wxNickName", getWxNickName()) + .append("wxAccount", getWxAccount()) + .append("wxPhone", getWxPhone()) + .append("wxCodeUrl", getWxCodeUrl()) + .append("remark", getRemark()) + .append("wxType", getWxType()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("delFlag", getDelFlag()) + .toString(); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FanStatisticsRequest.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FanStatisticsRequest.java new file mode 100644 index 000000000..3b5bb1b94 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FanStatisticsRequest.java @@ -0,0 +1,25 @@ +package com.stdiet.custom.dto.request; + +import com.stdiet.common.core.domain.BaseEntity; +import lombok.Data; + +import java.util.Date; + +@Data +public class FanStatisticsRequest extends BaseEntity { + + private static final long serialVersionUID = 1L; + + //销售用户ID + private Long userId; + + //进粉统计日期 + private Date fanTime; + + //微信ID数组 + private Long[] wxId; + + //微信进粉量数组 + private Integer[] fanNum; + +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java new file mode 100644 index 000000000..b4056910e --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/ExportFanStatisticsResponse.java @@ -0,0 +1,28 @@ +package com.stdiet.custom.dto.response; + +import com.stdiet.common.annotation.Excel; +import lombok.Data; + +@Data +public class ExportFanStatisticsResponse { + + //序号 + @Excel(name = "序号") + private Integer id; + + //销售姓名 + @Excel(name = "销售姓名") + private String saleName; + + //账号 + @Excel(name = "账号") + private String account; + + //微信号 + @Excel(name = "微信号") + private String wxAccount; + + //进粉量、 + @Excel(name = "进粉量") + private Integer fanNum; +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxDistributionMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxDistributionMapper.java new file mode 100644 index 000000000..60bdb4a72 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxDistributionMapper.java @@ -0,0 +1,76 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysWxDistribution; +import org.apache.ibatis.annotations.Param; + +/** + * 微信分配管理Mapper接口 + * + * @author xiezhijun + * @date 2021-02-03 + */ +public interface SysWxDistributionMapper +{ + /** + * 查询微信分配管理 + * + * @param id 微信分配管理ID + * @return 微信分配管理 + */ + public SysWxDistribution selectSysWxDistributionById(Long id); + + /** + * 查询微信分配管理列表 + * + * @param sysWxDistribution 微信分配管理 + * @return 微信分配管理集合 + */ + public List selectSysWxDistributionList(SysWxDistribution sysWxDistribution); + + /** + * 新增微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + public int insertSysWxDistribution(SysWxDistribution sysWxDistribution); + + /** + * 修改微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + public int updateSysWxDistribution(SysWxDistribution sysWxDistribution); + + /** + * 删除微信分配管理 + * + * @param id 微信分配管理ID + * @return 结果 + */ + public int deleteSysWxDistributionById(Long id); + + /** + * 批量删除微信分配管理 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysWxDistributionByIds(Long[] ids); + + /** + * 根据微信ID查询是否分配记录 + * @param wxId + * @return + */ + SysWxDistribution selectWxDistributionByWxId(@Param("wxId")Long wxId); + + /** + * 根据用户ID查询该用户被分配的微信号 + * @param userId + * @return + */ + List selectDistributionWxByUserId(@Param("userId")Long userId); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java new file mode 100644 index 000000000..567978e72 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxFanStatisticsMapper.java @@ -0,0 +1,73 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysWxFanStatistics; + +/** + * 进粉统计Mapper接口 + * + * @author xiezhijun + * @date 2021-02-03 + */ +public interface SysWxFanStatisticsMapper +{ + /** + * 查询进粉统计 + * + * @param id 进粉统计ID + * @return 进粉统计 + */ + public SysWxFanStatistics selectSysWxFanStatisticsById(Long id); + + /** + * 查询进粉统计列表 + * + * @param sysWxFanStatistics 进粉统计 + * @return 进粉统计集合 + */ + public List selectSysWxFanStatisticsList(SysWxFanStatistics sysWxFanStatistics); + + /** + * 新增进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + public int insertSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics); + + /** + * 修改进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + public int updateSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics); + + /** + * 删除进粉统计 + * + * @param id 进粉统计ID + * @return 结果 + */ + public int deleteSysWxFanStatisticsById(Long id); + + /** + * 批量删除进粉统计 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysWxFanStatisticsByIds(Long[] ids); + + /** + * 根据用户ID和进粉统计日期查询进粉统计记录 + */ + public List getWxFanStatisticsByUserIdAndFanTime(SysWxFanStatistics sysWxFanStatistics); + + /** + * 查询总进粉数量 + * @param sysWxFanStatistics + * @return + */ + public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics); +} \ 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 63cb0aba5..b605e8018 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 @@ -4,58 +4,65 @@ import java.util.List; import com.stdiet.custom.domain.SysWxSaleAccount; /** - * 微信销售账号Mapper接口 - * - * @author wonder - * @date 2021-01-29 + * 微信账号Mapper接口 + * + * @author xiezhijun + * @date 2021-02-03 */ -public interface SysWxSaleAccountMapper +public interface SysWxSaleAccountMapper { /** - * 查询微信销售账号 - * - * @param id 微信销售账号ID - * @return 微信销售账号 + * 查询微信账号 + * + * @param id 微信账号ID + * @return 微信账号 */ public SysWxSaleAccount selectSysWxSaleAccountById(Long id); /** - * 查询微信销售账号列表 - * - * @param sysWxSaleAccount 微信销售账号 - * @return 微信销售账号集合 + * 查询微信账号列表 + * + * @param sysWxSaleAccount 微信账号 + * @return 微信账号集合 */ public List selectSysWxSaleAccountList(SysWxSaleAccount sysWxSaleAccount); /** - * 新增微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 新增微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ public int insertSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount); /** - * 修改微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 修改微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ public int updateSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount); /** - * 删除微信销售账号 - * - * @param id 微信销售账号ID + * 删除微信账号 + * + * @param id 微信账号ID * @return 结果 */ public int deleteSysWxSaleAccountById(Long id); /** - * 批量删除微信销售账号 - * + * 批量删除微信账号 + * * @param ids 需要删除的数据ID * @return 结果 */ public int deleteSysWxSaleAccountByIds(Long[] ids); + + /** + * 根据微信号或手机号查询是否已存在 + * @param sysWxSaleAccount + * @return + */ + SysWxSaleAccount selectWxAccountByAccountOrPhone(SysWxSaleAccount sysWxSaleAccount); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxDistributionService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxDistributionService.java new file mode 100644 index 000000000..b11770240 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxDistributionService.java @@ -0,0 +1,75 @@ +package com.stdiet.custom.service; + +import java.util.List; +import com.stdiet.custom.domain.SysWxDistribution; + +/** + * 微信分配管理Service接口 + * + * @author xiezhijun + * @date 2021-02-03 + */ +public interface ISysWxDistributionService +{ + /** + * 查询微信分配管理 + * + * @param id 微信分配管理ID + * @return 微信分配管理 + */ + public SysWxDistribution selectSysWxDistributionById(Long id); + + /** + * 查询微信分配管理列表 + * + * @param sysWxDistribution 微信分配管理 + * @return 微信分配管理集合 + */ + public List selectSysWxDistributionList(SysWxDistribution sysWxDistribution); + + /** + * 新增微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + public int insertSysWxDistribution(SysWxDistribution sysWxDistribution); + + /** + * 修改微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + public int updateSysWxDistribution(SysWxDistribution sysWxDistribution); + + /** + * 批量删除微信分配管理 + * + * @param ids 需要删除的微信分配管理ID + * @return 结果 + */ + public int deleteSysWxDistributionByIds(Long[] ids); + + /** + * 删除微信分配管理信息 + * + * @param id 微信分配管理ID + * @return 结果 + */ + public int deleteSysWxDistributionById(Long id); + + /** + * 根据微信ID查询是否分配记录 + * @param wxId + * @return + */ + SysWxDistribution selectWxDistributionByWxId(Long wxId); + + /** + * 根据用户ID查询该用户被分配的微信号 + * @param userId + * @return + */ + List selectDistributionWxByUserId(Long userId); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java new file mode 100644 index 000000000..207d776a5 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxFanStatisticsService.java @@ -0,0 +1,85 @@ +package com.stdiet.custom.service; + +import java.util.List; + +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.custom.domain.SysWxFanStatistics; +import com.stdiet.custom.dto.request.FanStatisticsRequest; + +/** + * 进粉统计Service接口 + * + * @author xiezhijun + * @date 2021-02-03 + */ +public interface ISysWxFanStatisticsService +{ + /** + * 查询进粉统计 + * + * @param id 进粉统计ID + * @return 进粉统计 + */ + public SysWxFanStatistics selectSysWxFanStatisticsById(Long id); + + /** + * 查询进粉统计列表 + * + * @param sysWxFanStatistics 进粉统计 + * @return 进粉统计集合 + */ + public List selectSysWxFanStatisticsList(SysWxFanStatistics sysWxFanStatistics); + + /** + * 新增进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + public int insertSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics); + + /** + * 修改进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + public int updateSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics); + + /** + * 批量删除进粉统计 + * + * @param ids 需要删除的进粉统计ID + * @return 结果 + */ + public int deleteSysWxFanStatisticsByIds(Long[] ids); + + /** + * 删除进粉统计信息 + * + * @param id 进粉统计ID + * @return 结果 + */ + public int deleteSysWxFanStatisticsById(Long id); + + /** + * 同时给多个微信号添加进粉量统计 + * @param fanStatisticsRequest + * @return + */ + AjaxResult addWxFanNum(FanStatisticsRequest fanStatisticsRequest); + + /** + * 根据用户ID、微信ID、进粉时间查询统计 + * @param sysWxFanStatistics + * @return + */ + List getWxFanStatisticsByUserIdAndFanTime(SysWxFanStatistics sysWxFanStatistics); + + /** + * 查询总进粉数量 + * @param sysWxFanStatistics + * @return + */ + public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics); +} \ 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 534b8392f..66aff4ba0 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 @@ -1,64 +1,69 @@ package com.stdiet.custom.service; import java.util.List; - -import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.custom.domain.SysWxSaleAccount; /** - * 微信销售账号Service接口 - * - * @author wonder - * @date 2021-01-29 + * 微信账号Service接口 + * + * @author xiezhijun + * @date 2021-02-03 */ -public interface ISysWxSaleAccountService +public interface ISysWxSaleAccountService { /** - * 查询微信销售账号 - * - * @param id 微信销售账号ID - * @return 微信销售账号 + * 查询微信账号 + * + * @param id 微信账号ID + * @return 微信账号 */ public SysWxSaleAccount selectSysWxSaleAccountById(Long id); /** - * 查询微信销售账号列表 - * - * @param sysWxSaleAccount 微信销售账号 - * @return 微信销售账号集合 + * 查询微信账号列表 + * + * @param sysWxSaleAccount 微信账号 + * @return 微信账号集合 */ public List selectSysWxSaleAccountList(SysWxSaleAccount sysWxSaleAccount); /** - * 新增微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 新增微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ public int insertSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount); /** - * 修改微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 修改微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ public int updateSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount); /** - * 批量删除微信销售账号 - * - * @param ids 需要删除的微信销售账号ID + * 批量删除微信账号 + * + * @param ids 需要删除的微信账号ID * @return 结果 */ public int deleteSysWxSaleAccountByIds(Long[] ids); /** - * 删除微信销售账号信息 - * - * @param id 微信销售账号ID + * 删除微信账号信息 + * + * @param id 微信账号ID * @return 结果 */ public int deleteSysWxSaleAccountById(Long id); + /** + * 根据微信号或手机号查询是否已存在 + * @param accountOrPhone 手机号或微信号 + * @param type 0微信号 1手机号 + * @return + */ + SysWxSaleAccount selectWxAccountByAccountOrPhone(String accountOrPhone, int type); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxDistributionServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxDistributionServiceImpl.java new file mode 100644 index 000000000..7d992a7f1 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxDistributionServiceImpl.java @@ -0,0 +1,115 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; +import com.stdiet.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysWxDistributionMapper; +import com.stdiet.custom.domain.SysWxDistribution; +import com.stdiet.custom.service.ISysWxDistributionService; + +/** + * 微信分配管理Service业务层处理 + * + * @author xiezhijun + * @date 2021-02-03 + */ +@Service +public class SysWxDistributionServiceImpl implements ISysWxDistributionService +{ + @Autowired + private SysWxDistributionMapper sysWxDistributionMapper; + + /** + * 查询微信分配管理 + * + * @param id 微信分配管理ID + * @return 微信分配管理 + */ + @Override + public SysWxDistribution selectSysWxDistributionById(Long id) + { + return sysWxDistributionMapper.selectSysWxDistributionById(id); + } + + /** + * 查询微信分配管理列表 + * + * @param sysWxDistribution 微信分配管理 + * @return 微信分配管理 + */ + @Override + public List selectSysWxDistributionList(SysWxDistribution sysWxDistribution) + { + return sysWxDistributionMapper.selectSysWxDistributionList(sysWxDistribution); + } + + /** + * 新增微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + @Override + public int insertSysWxDistribution(SysWxDistribution sysWxDistribution) + { + sysWxDistribution.setCreateTime(DateUtils.getNowDate()); + return sysWxDistributionMapper.insertSysWxDistribution(sysWxDistribution); + } + + /** + * 修改微信分配管理 + * + * @param sysWxDistribution 微信分配管理 + * @return 结果 + */ + @Override + public int updateSysWxDistribution(SysWxDistribution sysWxDistribution) + { + sysWxDistribution.setUpdateTime(DateUtils.getNowDate()); + return sysWxDistributionMapper.updateSysWxDistribution(sysWxDistribution); + } + + /** + * 批量删除微信分配管理 + * + * @param ids 需要删除的微信分配管理ID + * @return 结果 + */ + @Override + public int deleteSysWxDistributionByIds(Long[] ids) + { + return sysWxDistributionMapper.deleteSysWxDistributionByIds(ids); + } + + /** + * 删除微信分配管理信息 + * + * @param id 微信分配管理ID + * @return 结果 + */ + @Override + public int deleteSysWxDistributionById(Long id) + { + return sysWxDistributionMapper.deleteSysWxDistributionById(id); + } + + /** + * 根据微信ID查询是否分配记录 + * @param wxId + * @return + */ + @Override + public SysWxDistribution selectWxDistributionByWxId(Long wxId){ + return sysWxDistributionMapper.selectWxDistributionByWxId(wxId); + } + + /** + * 根据用户ID查询该用户被分配的微信号 + * @param userId + * @return + */ + public List selectDistributionWxByUserId(Long userId){ + return sysWxDistributionMapper.selectDistributionWxByUserId(userId); + } +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java new file mode 100644 index 000000000..f14a833a0 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxFanStatisticsServiceImpl.java @@ -0,0 +1,147 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; + +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.utils.DateUtils; +import com.stdiet.custom.dto.request.FanStatisticsRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysWxFanStatisticsMapper; +import com.stdiet.custom.domain.SysWxFanStatistics; +import com.stdiet.custom.service.ISysWxFanStatisticsService; + +/** + * 进粉统计Service业务层处理 + * + * @author xiezhijun + * @date 2021-02-03 + */ +@Service +public class SysWxFanStatisticsServiceImpl implements ISysWxFanStatisticsService +{ + @Autowired + private SysWxFanStatisticsMapper sysWxFanStatisticsMapper; + + /** + * 查询进粉统计 + * + * @param id 进粉统计ID + * @return 进粉统计 + */ + @Override + public SysWxFanStatistics selectSysWxFanStatisticsById(Long id) + { + return sysWxFanStatisticsMapper.selectSysWxFanStatisticsById(id); + } + + /** + * 查询进粉统计列表 + * + * @param sysWxFanStatistics 进粉统计 + * @return 进粉统计 + */ + @Override + public List selectSysWxFanStatisticsList(SysWxFanStatistics sysWxFanStatistics) + { + return sysWxFanStatisticsMapper.selectSysWxFanStatisticsList(sysWxFanStatistics); + } + + /** + * 新增进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + @Override + public int insertSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics) + { + sysWxFanStatistics.setCreateTime(DateUtils.getNowDate()); + return sysWxFanStatisticsMapper.insertSysWxFanStatistics(sysWxFanStatistics); + } + + /** + * 修改进粉统计 + * + * @param sysWxFanStatistics 进粉统计 + * @return 结果 + */ + @Override + public int updateSysWxFanStatistics(SysWxFanStatistics sysWxFanStatistics) + { + sysWxFanStatistics.setUpdateTime(DateUtils.getNowDate()); + return sysWxFanStatisticsMapper.updateSysWxFanStatistics(sysWxFanStatistics); + } + + /** + * 批量删除进粉统计 + * + * @param ids 需要删除的进粉统计ID + * @return 结果 + */ + @Override + public int deleteSysWxFanStatisticsByIds(Long[] ids) + { + return sysWxFanStatisticsMapper.deleteSysWxFanStatisticsByIds(ids); + } + + /** + * 删除进粉统计信息 + * + * @param id 进粉统计ID + * @return 结果 + */ + @Override + public int deleteSysWxFanStatisticsById(Long id) + { + return sysWxFanStatisticsMapper.deleteSysWxFanStatisticsById(id); + } + + /** + * 根据用户ID、微信ID、进粉时间查询统计 + * @param sysWxFanStatistics + * @return + */ + @Override + public List getWxFanStatisticsByUserIdAndFanTime(SysWxFanStatistics sysWxFanStatistics){ + return sysWxFanStatisticsMapper.getWxFanStatisticsByUserIdAndFanTime(sysWxFanStatistics); + } + + /** + * 同时给多个微信号添加进粉量统计 + * @param fanStatisticsRequest + * @return + */ + public AjaxResult addWxFanNum(FanStatisticsRequest fanStatisticsRequest){ + int row = 0; + if(fanStatisticsRequest.getWxId() != null && fanStatisticsRequest.getUserId() != null){ + SysWxFanStatistics param = new SysWxFanStatistics(); + param.setUserId(fanStatisticsRequest.getUserId()); + param.setFanTime(fanStatisticsRequest.getFanTime()); + //查询今日是否已添加 + List oldWxFanStatisticsList = getWxFanStatisticsByUserIdAndFanTime(param); + if(oldWxFanStatisticsList != null && oldWxFanStatisticsList.size() > 0){ + return AjaxResult.error("今日已添加过进粉统计，无法重复添加"); + } + int index = 0; + for (Long wxId : fanStatisticsRequest.getWxId()) { + SysWxFanStatistics sysWxFanStatistics = new SysWxFanStatistics(); + sysWxFanStatistics.setWxId(wxId); + sysWxFanStatistics.setFanTime(fanStatisticsRequest.getFanTime()); + sysWxFanStatistics.setFanNum(fanStatisticsRequest.getFanNum()[index++]); + sysWxFanStatistics.setUserId(fanStatisticsRequest.getUserId()); + row = insertSysWxFanStatistics(sysWxFanStatistics); + } + } + return row > 0 ? AjaxResult.success() : AjaxResult.error("添加失败"); + } + + /** + * 查询总进粉数量 + * @param sysWxFanStatistics + * @return + */ + public int selectFanNumCount(SysWxFanStatistics sysWxFanStatistics){ + return sysWxFanStatisticsMapper.selectFanNumCount(sysWxFanStatistics); + } +} \ No newline at end of file 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 0ff744f83..042189aed 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 @@ -1,6 +1,8 @@ package com.stdiet.custom.service.impl; import java.util.List; +import com.stdiet.common.utils.DateUtils; +import com.stdiet.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.stdiet.custom.mapper.SysWxSaleAccountMapper; @@ -8,22 +10,22 @@ import com.stdiet.custom.domain.SysWxSaleAccount; import com.stdiet.custom.service.ISysWxSaleAccountService; /** - * 微信销售账号Service业务层处理 - * - * @author wonder - * @date 2021-01-29 + * 微信账号Service业务层处理 + * + * @author xiezhijun + * @date 2021-02-03 */ @Service -public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService +public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService { @Autowired private SysWxSaleAccountMapper sysWxSaleAccountMapper; /** - * 查询微信销售账号 - * - * @param id 微信销售账号ID - * @return 微信销售账号 + * 查询微信账号 + * + * @param id 微信账号ID + * @return 微信账号 */ @Override public SysWxSaleAccount selectSysWxSaleAccountById(Long id) @@ -32,10 +34,10 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService } /** - * 查询微信销售账号列表 - * - * @param sysWxSaleAccount 微信销售账号 - * @return 微信销售账号 + * 查询微信账号列表 + * + * @param sysWxSaleAccount 微信账号 + * @return 微信账号 */ @Override public List selectSysWxSaleAccountList(SysWxSaleAccount sysWxSaleAccount) @@ -44,33 +46,35 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService } /** - * 新增微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 新增微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ @Override public int insertSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount) { + sysWxSaleAccount.setCreateTime(DateUtils.getNowDate()); return sysWxSaleAccountMapper.insertSysWxSaleAccount(sysWxSaleAccount); } /** - * 修改微信销售账号 - * - * @param sysWxSaleAccount 微信销售账号 + * 修改微信账号 + * + * @param sysWxSaleAccount 微信账号 * @return 结果 */ @Override public int updateSysWxSaleAccount(SysWxSaleAccount sysWxSaleAccount) { + sysWxSaleAccount.setUpdateTime(DateUtils.getNowDate()); return sysWxSaleAccountMapper.updateSysWxSaleAccount(sysWxSaleAccount); } /** - * 批量删除微信销售账号 - * - * @param ids 需要删除的微信销售账号ID + * 批量删除微信账号 + * + * @param ids 需要删除的微信账号ID * @return 结果 */ @Override @@ -80,9 +84,9 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService } /** - * 删除微信销售账号信息 - * - * @param id 微信销售账号ID + * 删除微信账号信息 + * + * @param id 微信账号ID * @return 结果 */ @Override @@ -90,4 +94,21 @@ public class SysWxSaleAccountServiceImpl implements ISysWxSaleAccountService { return sysWxSaleAccountMapper.deleteSysWxSaleAccountById(id); } + + /** + * 根据微信号或手机号查询是否已存在 + * @param accountOrPhone 手机号或微信号 + * @param type 0微信号 1手机号 + * @return + */ + @Override + public SysWxSaleAccount selectWxAccountByAccountOrPhone(String accountOrPhone, int type){ + SysWxSaleAccount param = new SysWxSaleAccount(); + if(type == 0){ + param.setWxAccount(accountOrPhone); + }else{ + param.setWxPhone(accountOrPhone); + } + return sysWxSaleAccountMapper.selectWxAccountByAccountOrPhone(param); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml index ebc4b40c6..7f32de28e 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml @@ -111,6 +111,7 @@ + @@ -122,7 +123,7 @@ select sch.id, customer_id, conditioning_project_id, sex, age, weight, tall, condiment, other_condiment, cooking_style, cooking_style_rate, wash_vegetables_style, other_wash_vegetables_style, breakfast_type, breakfast_food, lunch_type, dinner, vegetable_rate, common_meat, dinner_time, supper_num, supper_food, diet_hot_and_cold, diet_flavor, vegetables_num, vegetables_rate_type, fruits_num, fruits_time, fruits_rate, rice_num, rice_full, eating_speed, snacks, other_snacks, health_products_flag, health_products_brand, health_products_name, health_products_week_rate, health_products_day_rate, water_num, water_type, water_habit, drinks_num, drink_wine_flag, drink_wine_classify, other_wine_classify, drink_wine_amount, smoke_flag, smoke_rate, second_smoke, work_industry, work_type, defecation_num, other_defecation_num, defecation_time, defecation_shape, defecation_smell, defecation_speed, defecation_color, motion_num, motion_duration, motion_time, aerobic_motion_classify, anaerobic_motion_classify, anaerobic_aerobic_motion_classify, other_motion_classify, motion_field, other_motion_field, sleep_time, sleep_quality, sleep_drug_flag, sleep_drug, stayup_late_flag, stayup_late_week_num, family_illness_history, other_family_illness_history, operation_history, other_operation_history, near_operation_flag, recoverye_situation, long_eat_drug_flag, long_eat_drug_classify, other_long_eat_drug_classify, allergy_flag, allergy_situation, allergen, other_allergen, medical_report, medical_report_name, - position,experience,rebound,difficulty,crux,dishes_ingredient,make_food_type,physical_signs_id,other_physical_signs,blood_data,moisture_date, + position,experience,rebound,difficulty,crux,dishes_ingredient,make_food_type,physical_signs_id,other_physical_signs,blood_data,moisture_date,sch.remark, sch.create_time, sch.create_by,sch. update_time, sch.update_by, sch.del_flag @@ -259,6 +260,7 @@ other_physical_signs, blood_data, moisture_date, + remark, create_time, create_by, update_time, @@ -366,6 +368,7 @@ #{otherPhysicalSigns}, #{bloodData}, #{moistureDate}, + #{remark}, #{createTime}, #{createBy}, #{updateTime}, @@ -476,6 +479,7 @@ other_physical_signs = #{otherPhysicalSigns}, blood_data = #{bloodData}, moisture_date = #{moistureDate}, + remark = #{remark}, create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxDistributionMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxDistributionMapper.xml new file mode 100644 index 000000000..3fe2b2568 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxDistributionMapper.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, user_id, sale_group_id, account_id, wechat_account, wechat_account_type, create_time, create_by, update_time, update_by, del_flag from sys_wx_distribution + + + + SELECT swd.id, swd.user_id, swd.sale_group_id, swd.account_id, swd.wechat_account,swd.create_time, + su.nick_name as user_name,acc.dict_label as account,asg.dict_label as sale_group, + swsa.wx_nick_name,swsa.wx_account + FROM sys_wx_distribution AS swd + lEFT JOIN sys_wx_sale_account swsa ON swsa.id = swd.wechat_account and swsa.del_flag = 0 + LEFT JOIN sys_user su ON su.user_id = swd.user_id AND su.del_flag = 0 + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS acc ON acc.dict_value = swd.account_id + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'sale_group') AS asg ON asg.dict_value = swd.sale_group_id + where swd.del_flag = 0 + + + + + + + + insert into sys_wx_distribution + + user_id, + sale_group_id, + account_id, + wechat_account, + wechat_account_type, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{userId}, + #{saleGroupId}, + #{accountId}, + #{wechatAccount}, + #{wechatAccountType}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update sys_wx_distribution + + user_id = #{userId}, + sale_group_id = #{saleGroupId}, + account_id = #{accountId}, + wechat_account = #{wechatAccount}, + wechat_account_type = #{wechatAccountType}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_wx_distribution set del_flag = 1 where id = #{id} + + + + update sys_wx_distribution set del_flag = 1 where id in + + #{id} + + + + + + + + + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml new file mode 100644 index 000000000..a1470da89 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select id, wx_id, fan_time, fan_num, create_time, create_by, update_time, update_by, del_flag from sys_wx_fan_statistics + + + + select + swfs.id, swfs.wx_id, swfs.fan_time, swfs.fan_num, swfs.create_time, swfs.create_by, swfs.update_time, swfs.update_by, swfs.del_flag, + su.nick_name as user_name,acc.dict_label as account,asg.dict_label as sale_group,swsa.wx_nick_name,swsa.wx_account,swd.sale_group_id + from sys_wx_fan_statistics swfs + left join sys_wx_sale_account swsa on swsa.id = swfs.wx_id and swsa.del_flag = 0 + left join sys_wx_distribution swd on swd.wechat_account = swfs.wx_id and swd.del_flag = 0 + left join sys_user su on su.user_id = swd.user_id and su.del_flag = 0 + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS acc ON acc.dict_value = swd.account_id + LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'sale_group') AS asg ON asg.dict_value = swd.sale_group_id + + + + + + + + + + + + + insert into sys_wx_fan_statistics + + wx_id, + fan_time, + fan_num, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{wxId}, + #{fanTime}, + #{fanNum}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update sys_wx_fan_statistics + + wx_id = #{wxId}, + fan_time = #{fanTime}, + fan_num = #{fanNum}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_wx_fan_statistics set del_flag = 1 where id = #{id} + + + + update sys_wx_fan_statistics set del_flag = 1 where id in + + #{id} + + + + + + \ 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 26b992bdd..91140b19a 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxSaleAccountMapper.xml @@ -6,82 +6,99 @@ - - - - + + + + - - - + + + + + + - select id, nick_name, account_id, wx_id, phone, remark, img_url, count, media_id from sys_wx_sale_account + select id, wx_nick_name, wx_account, wx_phone, wx_code_url, remark, wx_type, create_time, create_by, update_time, update_by, del_flag from sys_wx_sale_account insert into sys_wx_sale_account - nick_name, - account_id, - wx_id, - phone, + wx_nick_name, + wx_account, + wx_phone, + wx_code_url, remark, - img_url, - count, - media_id, + wx_type, + create_time, + create_by, + update_time, + update_by, + del_flag, - #{nickName}, - #{accountId}, - #{wxId}, - #{phone}, + #{wxNickName}, + #{wxAccount}, + #{wxPhone}, + #{wxCodeUrl}, #{remark}, - #{imgUrl}, - #{count}, - #{mediaId}, + #{wxType}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, update sys_wx_sale_account - nick_name = #{nickName}, - account_id = #{accountId}, - wx_id = #{wxId}, - phone = #{phone}, + wx_nick_name = #{wxNickName}, + wx_account = #{wxAccount}, + wx_phone = #{wxPhone}, + wx_code_url = #{wxCodeUrl}, remark = #{remark}, - img_url = #{imgUrl}, - count = #{count}, - media_id = #{mediaId}, + wx_type = #{wxType}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, where id = #{id} - - delete from sys_wx_sale_account where id = #{id} - + + update sys_wx_sale_account set del_flag = 1 where id = #{id} + - - delete from sys_wx_sale_account where id in + + update sys_wx_sale_account set del_flag = 1 where id in #{id} - + + + \ No newline at end of file diff --git a/stdiet-ui/src/api/custom/fanStatistics.js b/stdiet-ui/src/api/custom/fanStatistics.js new file mode 100644 index 000000000..14d90f2dc --- /dev/null +++ b/stdiet-ui/src/api/custom/fanStatistics.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 查询进粉统计列表 +export function listFanStatistics(query) { + return request({ + url: '/custom/fanStatistics/list', + method: 'get', + params: query + }) +} + +// 查询进粉统计详细 +export function getFanStatistics(id) { + return request({ + url: '/custom/fanStatistics/' + id, + method: 'get' + }) +} + +// 新增进粉统计 +export function addFanStatistics(data) { + return request({ + url: '/custom/fanStatistics', + method: 'post', + data: data + }) +} + +// 修改进粉统计 +export function updateFanStatistics(data) { + return request({ + url: '/custom/fanStatistics', + method: 'put', + data: data + }) +} + +// 删除进粉统计 +export function delFanStatistics(id) { + return request({ + url: '/custom/fanStatistics/' + id, + method: 'delete' + }) +} + +// 导出进粉统计 +export function exportFanStatistics(query) { + return request({ + url: '/custom/fanStatistics/export', + method: 'get', + params: query + }) +} + +// 获取 +export function getWxByUserId(userId) { + return request({ + url: '/custom/fanStatistics/getWxByUserId', + method: 'get', + params: {"userId": userId} + }) +} + + + diff --git a/stdiet-ui/src/api/custom/WxAccount.js b/stdiet-ui/src/api/custom/wxAccount.js similarity index 61% rename from stdiet-ui/src/api/custom/WxAccount.js rename to stdiet-ui/src/api/custom/wxAccount.js index 19bddf9b5..4320b65fa 100644 --- a/stdiet-ui/src/api/custom/WxAccount.js +++ b/stdiet-ui/src/api/custom/wxAccount.js @@ -1,55 +1,53 @@ import request from '@/utils/request' -// 查询微信销售账号列表 +// 查询微信账号列表 export function listWxAccount(query) { return request({ - url: '/custom/WxAccount/list', + url: '/custom/wxAccount/list', method: 'get', params: query }) } -// 查询微信销售账号详细 +// 查询微信账号详细 export function getWxAccount(id) { return request({ - url: '/custom/WxAccount/' + id, + url: '/custom/wxAccount/' + id, method: 'get' }) } -// 新增微信销售账号 +// 新增微信账号 export function addWxAccount(data) { return request({ - url: '/custom/WxAccount', + url: '/custom/wxAccount', method: 'post', data: data }) } -// 修改微信销售账号 +// 修改微信账号 export function updateWxAccount(data) { return request({ - url: '/custom/WxAccount', + url: '/custom/wxAccount', method: 'put', data: data }) } -// 删除微信销售账号 +// 删除微信账号 export function delWxAccount(id) { return request({ - url: '/custom/WxAccount/' + id, + url: '/custom/wxAccount/' + id, method: 'delete' }) } -// 导出微信销售账号 +// 导出微信账号 export function exportWxAccount(query) { return request({ - url: '/custom/WxAccount/export', + url: '/custom/wxAccount/export', method: 'get', params: query }) } - - diff --git a/stdiet-ui/src/api/custom/wxDistribution.js b/stdiet-ui/src/api/custom/wxDistribution.js new file mode 100644 index 000000000..2ca128e5c --- /dev/null +++ b/stdiet-ui/src/api/custom/wxDistribution.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询微信分配管理列表 +export function listWxDistribution(query) { + return request({ + url: '/custom/wxDistribution/list', + method: 'get', + params: query + }) +} + +// 查询微信分配管理详细 +export function getWxDistribution(id) { + return request({ + url: '/custom/wxDistribution/' + id, + method: 'get' + }) +} + +// 新增微信分配管理 +export function addWxDistribution(data) { + return request({ + url: '/custom/wxDistribution', + method: 'post', + data: data + }) +} + +// 修改微信分配管理 +export function updateWxDistribution(data) { + return request({ + url: '/custom/wxDistribution', + method: 'put', + data: data + }) +} + +// 删除微信分配管理 +export function delWxDistribution(id) { + return request({ + url: '/custom/wxDistribution/' + id, + method: 'delete' + }) +} + +// 导出微信分配管理 +export function exportWxDistribution(query) { + return request({ + url: '/custom/wxDistribution/export', + method: 'get', + params: query + }) +} diff --git a/stdiet-ui/src/components/HealthyForm/Form1.vue b/stdiet-ui/src/components/HealthyForm/Form1.vue index 74f820615..6801e0958 100644 --- a/stdiet-ui/src/components/HealthyForm/Form1.vue +++ b/stdiet-ui/src/components/HealthyForm/Form1.vue @@ -15,13 +15,13 @@ - + - + - + diff --git a/stdiet-ui/src/components/HealthyForm/Form4.vue b/stdiet-ui/src/components/HealthyForm/Form4.vue index 4c72eccff..c4f79a00f 100644 --- a/stdiet-ui/src/components/HealthyForm/Form4.vue +++ b/stdiet-ui/src/components/HealthyForm/Form4.vue @@ -46,10 +46,10 @@

4、生食果蔬状况

- + - + {{item.name}} diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue index 6e54587cb..c1dee6968 100644 --- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue @@ -127,8 +127,8 @@ export default { ], [ ["早餐习惯","早餐吃的食物","午餐习惯"],["晚餐习惯","正餐中素菜占比","最常吃的肉类"], - ["晚餐时间","每周吃夜宵次数","夜宵通常吃的食物"],["食物的冷热偏好","食物的口味偏好","平均每周吃生菜几次"], - ["每周吃生菜的频次类型","平均每天吃水果次数","吃水果的时间段"],["平时吃水果的频次","一餐吃几碗饭","吃几成饱"], + ["晚餐时间","每周吃夜宵次数","夜宵通常吃的食物"],["食物的冷热偏好","食物的口味偏好","平均每周吃生蔬菜几次"], + ["每周吃生蔬菜的频次类型","平均每天吃水果次数","吃水果的时间段"],["平时吃水果的频次","一餐吃几碗饭","吃几成饱"], ["吃饭速度","饮食特点","常吃的零食"],["有无服用营养保健品","营养保健品品牌名","营养保健品产品名"], ["服用营养保健品频次","忌口过敏食物",""] ], diff --git a/stdiet-ui/src/components/PhysicalSignsEdit/index.vue b/stdiet-ui/src/components/PhysicalSignsEdit/index.vue index 9de4f9668..e40b9eb73 100644 --- a/stdiet-ui/src/components/PhysicalSignsEdit/index.vue +++ b/stdiet-ui/src/components/PhysicalSignsEdit/index.vue @@ -20,7 +20,7 @@ - + 提交 取消 @@ -61,6 +61,7 @@ export default { healthyData:healthyData, showModuleArray:[0], stepArray: [true,false,false,false,false,false,false,false,false], + submitShow: true, visible: false, title: "", data: undefined, @@ -90,7 +91,7 @@ export default { { required: true, trigger: "blur", - pattern: /^[1-9]\d*$/, + pattern: /^(\d+)(\.\d{1})?$/, message: "体重格式不正确", }, ], @@ -162,12 +163,14 @@ export default { }); }, changeShowModule(){ - console.log("---------------"); + let allShow = false; for(var i = 0; i < this.stepArray.length; i++){ let flag = this.showModuleArray.find((opt) => opt === i); - console.log(flag != null && flag != undefined); - this.$set(this.stepArray, i, (flag != null && flag != undefined)); + let showFlag = flag != null && flag != undefined + this.$set(this.stepArray, i, showFlag); + allShow = showFlag ? showFlag : allShow; } + this.submitShow = allShow; } } }; diff --git a/stdiet-ui/src/views/custom/fanStatistics/index.vue b/stdiet-ui/src/views/custom/fanStatistics/index.vue new file mode 100644 index 000000000..47e8f9e80 --- /dev/null +++ b/stdiet-ui/src/views/custom/fanStatistics/index.vue @@ -0,0 +1,449 @@ + + + diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue index 4e0abd9b6..559c00980 100644 --- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue +++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue @@ -1,9 +1,9 @@ + +