微信导粉统计

2021-02-04 20:12:46 +08:00
parent 2e3f53f2ea
commit 0283eb0a1d
33 changed files with 2923 additions and 256 deletions
--- 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
@@ -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<SysWxDistribution> 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<SysWxDistribution> list = sysWxDistributionService.selectSysWxDistributionList(sysWxDistribution);
+        ExcelUtil<SysWxDistribution> util = new ExcelUtil<SysWxDistribution>(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));
+    }
+}
--- 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
@@ -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<SysWxFanStatistics> 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<SysWxFanStatistics> list = sysWxFanStatisticsService.selectSysWxFanStatisticsList(sysWxFanStatistics);
+        List<ExportFanStatisticsResponse> 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<ExportFanStatisticsResponse> util = new ExcelUtil<ExportFanStatisticsResponse>(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<SysWxFanStatistics> 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<SysWxDistribution> list = sysWxDistributionService.selectDistributionWxByUserId(userId);
+        return AjaxResult.success(list);
+    }
+}
--- 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<SysWxSaleAccount> 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<SysWxSaleAccount> list = sysWxSaleAccountService.selectSysWxSaleAccountList(sysWxSaleAccount);
        ExcelUtil<SysWxSaleAccount> util = new ExcelUtil<SysWxSaleAccount>(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());
-        }
-    }
-
 }