rebate

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

@@ -1,78 +0,0 @@
-package com.zhongzheng.controller.distribution;
-
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityGoodsQueryBo;
-import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
-import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
-import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Api(value = "分享活动控制器", tags = {"分享活动管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/distribution/activity")
-public class DistributionActivityController extends BaseController {
-
-    private final IDistributionActivityService iDistributionActivityService;
-
-    private final IDistributionActivityGoodsService iDistributionActivityGoodsService;
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询分享活动列表")
-    @PreAuthorize("@ss.hasPermi('system:activity:list')")
-    @GetMapping("/list")
-    public TableDataInfo<DistributionActivityVo> list(DistributionActivityQueryBo bo) {
-        startPage();
-        List<DistributionActivityVo> list = iDistributionActivityService.queryList(bo);
-        return getDataTable(list);
-    }
-
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation("获取分享活动详细信息")
-    @PreAuthorize("@ss.hasPermi('system:activity:query')")
-    @GetMapping("/{distributionId}")
-    public AjaxResult<DistributionActivityVo> getInfo(@PathVariable("distributionId" ) Long distributionId) {
-        return AjaxResult.success(iDistributionActivityService.queryById(distributionId));
-    }
-
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation("查询活动详情商品列表")
-    @PreAuthorize("@ss.hasPermi('system:activity:list')")
-    @GetMapping("/goodsList")
-    public TableDataInfo<DistributionActivityGoodsVo> getDetailGoodsList(DistributionActivityGoodsQueryBo bo) {
-        startPage();
-        List<DistributionActivityGoodsVo> list = iDistributionActivityGoodsService.getDetailGoodsList(bo);
-        return getDataTable(list);
-    }
-
-
-}

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

@@ -1,67 +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.WxLoginService;
-import com.zhongzheng.framework.web.service.WxTokenService;
-import com.zhongzheng.modules.distribution.bo.DistributionLinkAddBo;
-import com.zhongzheng.modules.distribution.bo.DistributionLinkEditBo;
-import com.zhongzheng.modules.distribution.bo.DistributionLinkQueryBo;
-import com.zhongzheng.modules.distribution.service.IDistributionLinkService;
-import com.zhongzheng.modules.distribution.vo.DistributionLinkVo;
-import com.zhongzheng.modules.user.entity.ClientLoginUser;
-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-23
- */
-@Api(value = "分销链路控制器", tags = {"分销链路管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/link")
-public class DistributionLinkController extends BaseController {
-
-    private final IDistributionLinkService iDistributionLinkService;
-
-    private final WxTokenService wxTokenService;
-
-    /**
-     * 新增分销链路
-     */
-    @ApiOperation("绑定分销链路")
-    @PreAuthorize("@ss.hasPermi('system:link:add')")
-    @Log(title = "分销链路", businessType = BusinessType.INSERT)
-    @PostMapping()
-    public AjaxResult<Void> add(@RequestBody DistributionLinkAddBo bo) {
-        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
-        bo.setUserId(loginUser.getUser().getUserId());
-        return toAjax(iDistributionLinkService.bindLink(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);
-    }
-
-
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1124,6 +1124,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             cashFreezeLogAddBo.setDiffNum(vo.getCash().negate());
             cashFreezeLogAddBo.setRelatedSn(vo.getOrderSn());
             cashFreezeLogAddBo.setType(1L);
+            cashFreezeLogAddBo.setRemark("系统解冻");
             iDistributionCashLogService.insertByAddBo(cashFreezeLogAddBo);
 
             //可提现日志
@@ -1136,6 +1137,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
             cashLogAddBo.setDiffNum(vo.getCash());
             cashLogAddBo.setRelatedSn(vo.getOrderSn());
             cashLogAddBo.setType(2L);
+            cashLogAddBo.setRemark("系统解冻");
             iDistributionCashLogService.insertByAddBo(cashLogAddBo);
 
             seller.setCash(newCash);