fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/alioss/OssController.java

@@ -3,7 +3,6 @@ package com.zhongzheng.controller.alioss;
 
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
 import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.alioss.bo.OssRequest;
 import com.zhongzheng.modules.alioss.service.OssService;
@@ -42,7 +41,6 @@ public class OssController {
 
     private final WxTokenService wxTokenService;
 
-    private final SellerTokenService sellerTokenService;
 
     /**
      * policy获得

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityPosterController.java

@@ -1,70 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import java.util.List;
-import java.util.Arrays;
-import java.util.Map;
-
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityPosterQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityPosterVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import lombok.RequiredArgsConstructor;
-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.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 分销海报Controller
- *
- * @author ruoyi
- * @date 2023-03-22
- */
-@Api(value = "分销海报控制器", tags = {"分销海报管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/poster")
-public class DistributionActivityPosterController extends BaseController {
-
-    private final IDistributionActivityPosterService iDistributionActivityPosterService;
-
-    private final SellerTokenService sellerTokenService;
-
-
-
-    /**
-     * 获取分销海报详细信息
-     */
-    @ApiOperation("生成业务员海报")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
-    @GetMapping("/makePoster")
-    public AjaxResult<String> makePoster(DistributionActivityPosterQueryBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        return AjaxResult.success("成功",iDistributionActivityPosterService.makePoster(bo));
-    }
-
-    @ApiOperation("获取分享链条码")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
-    @GetMapping("/linkCode")
-    public AjaxResult<String> linkCode(DistributionActivityPosterQueryBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        return AjaxResult.success("成功",iDistributionActivityPosterService.getLinkCode(bo));
-    }
-
-
-}

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionCashLogController.java

@@ -1,56 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashLogService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashLogVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import lombok.RequiredArgsConstructor;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 业务员金额操作日志Controller
- *
- * @author ruoyi
- * @date 2023-03-25
- */
-@Api(value = "业务员金额操作日志控制器", tags = {"业务员金额操作日志管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/cash/log")
-public class DistributionCashLogController extends BaseController {
-
-    private final IDistributionCashLogService iDistributionCashLogService;
-
-    private final SellerTokenService sellerTokenService;
-
-    /**
-     * 查询业务员金额操作日志列表
-     */
-    @ApiOperation("查询业务员佣金列表")
-    @PreAuthorize("@ss.hasPermi('system:log:list')")
-    @GetMapping("/fromOrderCashList")
-    public TableDataInfo<DistributionCashLogVo> fromOrderCashList(DistributionCashLogQueryBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        startPage();
-        List<DistributionCashLogVo> list = iDistributionCashLogService.fromOrderCashList(bo);
-        return getDataTable(list);
-    }
-
-
-
-}

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionCashWithdrawalController.java

@@ -1,88 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import java.util.List;
-import java.util.Arrays;
-
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
-import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import lombok.RequiredArgsConstructor;
-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.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 分销业务员提现申请Controller
- *
- * @author ruoyi
- * @date 2023-03-25
- */
-@Api(value = "分销业务员提现申请控制器", tags = {"分销业务员提现申请管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/withdrawal")
-public class DistributionCashWithdrawalController extends BaseController {
-
-    private final IDistributionCashWithdrawalService iDistributionCashWithdrawalService;
-
-    private final SellerTokenService sellerTokenService;
-
-    /**
-     * 查询分销业务员提现申请列表
-     */
-    @ApiOperation("查询分销业务员提现申请列表")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:list')")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionCashWithdrawalVo> list(DistributionCashWithdrawalQueryBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        startPage();
-        List<DistributionCashWithdrawalVo> list = iDistributionCashWithdrawalService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取分销业务员提现申请详细信息
-     */
-    @ApiOperation("获取分销业务员提现申请详细信息")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:query')")
-    @GetMapping("/{id}")
-    public AjaxResult<DistributionCashWithdrawalVo> getInfo(@PathVariable("id" ) Long id) {
-        return AjaxResult.success(iDistributionCashWithdrawalService.queryById(id));
-    }
-
-    /**
-     * 新增分销业务员提现申请
-     */
-    @ApiOperation("新增分销业务员提现申请")
-    @PreAuthorize("@ss.hasPermi('system:withdrawal:add')")
-    @Log(title = "分销业务员提现申请", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionCashWithdrawalAddBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        return toAjax(iDistributionCashWithdrawalService.insertByAddBo(bo) ? 1 : 0);
-    }
-
-
-}

zhongzheng-api/src/main/java/com/zhongzheng/controller/distribution/DistributionSellerController.java

@@ -1,98 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import java.util.List;
-import java.util.Arrays;
-
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.framework.web.service.SellerTokenService;
-import com.zhongzheng.framework.web.service.WxLoginService;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionSellerQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
-import com.zhongzheng.modules.distribution.vo.DistributionSellerVo;
-import com.zhongzheng.modules.user.bo.UserVisitLogAddBo;
-import com.zhongzheng.modules.user.domain.UserWxFollow;
-import com.zhongzheng.modules.user.entity.ClientLoginSeller;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
-import com.zhongzheng.modules.user.vo.UserVo;
-import com.zhongzheng.modules.wx.bo.WxLoginBody;
-import lombok.RequiredArgsConstructor;
-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.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * 分销业务员Controller
- *
- * @author hjl
- * @date 2023-03-13
- */
-@Api(value = "分销业务员控制器", tags = {"分销业务员管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/seller")
-public class DistributionSellerController extends BaseController {
-
-    private final IDistributionSellerService iDistributionSellerService;
-
-    private final SellerTokenService sellerTokenService;
-
-    private final WxLoginService wxLoginService;
-
-    /**
-     * 查询分销业务员列表
-     */
-    @ApiOperation("查询分销业务员列表")
-    @PreAuthorize("@ss.hasPermi('system:seller:list')")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionSellerVo> list(DistributionSellerQueryBo bo) {
-        startPage();
-        List<DistributionSellerVo> list = iDistributionSellerService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-
-    /**
-     * 新增分销业务员
-     */
-   /* @ApiOperation("新增分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:add')")
-    @Log(title = "分销业务员", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionSellerAddBo bo) {
-        return toAjax(iDistributionSellerService.insertByAddBo(bo) ? 1 : 0);
-    }*/
-
-    /**
-     * 修改分销业务员
-     */
-    @ApiOperation("修改分销业务员")
-    @PreAuthorize("@ss.hasPermi('system:seller:edit')")
-    @Log(title = "分销业务员", businessType = BusinessType.UPDATE)
-    @PostMapping("/edit")
-    public AjaxResult<Void> edit(@RequestBody DistributionSellerEditBo bo) {
-        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setSellerId(loginUser.getSeller().getSellerId());
-        return toAjax(iDistributionSellerService.updateByEditBo(bo) ? 1 : 0);
-    }
-
-
-}