fix log

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

@@ -0,0 +1,86 @@
+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) {
+        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

@@ -6,6 +6,7 @@ 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;
@@ -16,6 +17,7 @@ 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;
@@ -52,6 +54,8 @@ public class DistributionSellerController extends BaseController {
 
     private final SellerTokenService sellerTokenService;
 
+    private final WxLoginService wxLoginService;
+
     /**
      * 查询分销业务员列表
      */
@@ -105,5 +109,22 @@ public class DistributionSellerController extends BaseController {
         return AjaxResult.success(vo);
     }
 
+    @ApiOperation("业务员检查是否绑定公众号")
+    @GetMapping("/checkBindGzh")
+    public AjaxResult<String> checkBindGzh()
+    {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        DistributionSellerVo vo = iDistributionSellerService.queryById(loginUser.getSeller().getSellerId());
+        return AjaxResult.success("成功",vo.getGzhOpenId());
+    }
 
+    @ApiOperation("提现前绑定公众号openid")
+    @PostMapping("/gzh_bind")
+    public AjaxResult gzh_bind(@RequestBody WxLoginBody loginBody)
+    {
+        ClientLoginSeller loginUser = sellerTokenService.getLoginUser(ServletUtils.getRequest());
+        loginBody.setSellerId(loginUser.getSeller().getSellerId());
+        wxLoginService.bindWxGzhUnionIdSeller(loginBody);
+        return AjaxResult.success();
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/WxLoginService.java

@@ -24,6 +24,8 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.common.utils.ip.IpUtils;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
 import com.zhongzheng.modules.course.bo.SectionWatchPerBo;
+import com.zhongzheng.modules.distribution.domain.DistributionSeller;
+import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.GoodsVo;
@@ -158,6 +160,9 @@ public class WxLoginService implements IWxLoginService {
     @Autowired
     private ISysConfigService configService;
 
+    @Autowired
+    private IDistributionSellerService iDistributionSellerService;
+
     private final String KEY_PREFIX = "GOODS_SHARE";
 
     public void initData(){
@@ -1263,6 +1268,38 @@ public class WxLoginService implements IWxLoginService {
         return user;
     }
 
+    public DistributionSeller bindWxGzhUnionIdSeller(WxLoginBody loginBody) {
+        initData();
+        String param = String.format(gzh_wxAuthParam, gzh_appid, gzh_appsrcret, loginBody.getCode());
+        String resultString = HttpUtils.sendGet(gzh_wxAuthUrl, param);
+        //解析json
+        JSONObject jsonObject = (JSONObject) JSONObject.parse(resultString);
+        String access_token = String.valueOf(jsonObject.get("access_token"));
+        if(access_token.equals("null")){
+            throw new CustomException( String.valueOf(jsonObject.get("errmsg")));
+        }
+        String openId = String.valueOf(jsonObject.get("openid"));
+
+        String userInfoParam = String.format(gzh_wxUserInfoParam, access_token, openId);
+        String userInfoResultString = HttpUtils.sendGet(gzh_wxUserInfoUrl, userInfoParam);
+
+        //解析json
+        JSONObject jsonObject1 = (JSONObject) JSONObject.parse(userInfoResultString);
+        String unionId = String.valueOf(jsonObject1.get("unionid"));
+        DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>().eq(DistributionSeller::getSellerId,loginBody.getSellerId()));
+        if (seller == null) {
+            throw new CustomException("您尚未注册，请前往小程序注册");
+        }
+        if (Validator.isEmpty(seller.getGzhOpenId())) {
+            seller.setGzhOpenId(openId);
+            if (unionId.equals("null")) {
+                seller.setUnionId(unionId);
+            }
+            iDistributionSellerService.updateById(seller);
+        }
+        return seller;
+    }
+
     public String obtainWxPhone(String iv, String encryptedData, String session_key) {
         String userInfo = null;
         JSONObject userInfoJSON = null;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionCashWithdrawalAddBo.java

@@ -0,0 +1,58 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+import java.math.BigDecimal;
+
+/**
+ * 分销业务员提现申请添加对象 distribution_cash_withdrawal
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("分销业务员提现申请添加对象")
+public class DistributionCashWithdrawalAddBo {
+
+    /** 提现申请编号 */
+    @ApiModelProperty("提现申请编号")
+    private String cwSn;
+    /** 业务员ID */
+    @ApiModelProperty("业务员ID")
+    private Long sellerId;
+    /** 提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝 */
+    @ApiModelProperty("提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝")
+    private Integer cwStatus;
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+    /** 状态：1有效，-1无效 */
+    @ApiModelProperty("状态：1有效，-1无效")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 打款时间 */
+    @ApiModelProperty("打款时间")
+    private Long payTime;
+    /** 拒绝时间 */
+    @ApiModelProperty("拒绝时间")
+    private Long refundTime;
+    /** 拒绝原因 */
+    @ApiModelProperty("拒绝原因")
+    private String refundResaon;
+    /** 提现金额 */
+    @ApiModelProperty("提现金额")
+    private BigDecimal cash;
+    /** 申请时间 */
+    @ApiModelProperty("申请时间")
+    private Long applyTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionCashWithdrawalEditBo.java

@@ -0,0 +1,70 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 分销业务员提现申请编辑对象 distribution_cash_withdrawal
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("分销业务员提现申请编辑对象")
+public class DistributionCashWithdrawalEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 提现申请编号 */
+    @ApiModelProperty("提现申请编号")
+    private String cwSn;
+
+    /** 业务员ID */
+    @ApiModelProperty("业务员ID")
+    private Long sellerId;
+
+    /** 提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝 */
+    @ApiModelProperty("提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝")
+    private Integer cwStatus;
+
+    /** 备注 */
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /** 状态：1有效，-1无效 */
+    @ApiModelProperty("状态：1有效，-1无效")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+
+    /** 打款时间 */
+    @ApiModelProperty("打款时间")
+    private Long payTime;
+
+    /** 拒绝时间 */
+    @ApiModelProperty("拒绝时间")
+    private Long refundTime;
+
+    /** 拒绝原因 */
+    @ApiModelProperty("拒绝原因")
+    private String refundResaon;
+
+    /** 提现金额 */
+    @ApiModelProperty("提现金额")
+    private BigDecimal cash;
+
+    /** 申请时间 */
+    @ApiModelProperty("申请时间")
+    private Long applyTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionCashWithdrawalQueryBo.java

@@ -0,0 +1,67 @@
+package com.zhongzheng.modules.distribution.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import java.math.BigDecimal;
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 分销业务员提现申请分页查询对象 distribution_cash_withdrawal
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("分销业务员提现申请分页查询对象")
+public class DistributionCashWithdrawalQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 提现申请编号 */
+	@ApiModelProperty("提现申请编号")
+	private String cwSn;
+	/** 业务员ID */
+	@ApiModelProperty("业务员ID")
+	private Long sellerId;
+	/** 提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝 */
+	@ApiModelProperty("提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝")
+	private Integer cwStatus;
+	/** 状态：1有效，-1无效 */
+	@ApiModelProperty("状态：1有效，-1无效")
+	private Integer status;
+	/** 打款时间 */
+	@ApiModelProperty("打款时间")
+	private Long payTime;
+	/** 拒绝时间 */
+	@ApiModelProperty("拒绝时间")
+	private Long refundTime;
+	/** 拒绝原因 */
+	@ApiModelProperty("拒绝原因")
+	private String refundResaon;
+	/** 提现金额 */
+	@ApiModelProperty("提现金额")
+	private BigDecimal cash;
+	/** 申请时间 */
+	@ApiModelProperty("申请时间")
+	private Long applyTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionCashWithdrawal.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.distribution.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 分销业务员提现申请对象 distribution_cash_withdrawal
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("distribution_cash_withdrawal")
+public class DistributionCashWithdrawal implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 提现申请编号 */
+    private String cwSn;
+    /** 业务员ID */
+    private Long sellerId;
+    /** 提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝 */
+    private Integer cwStatus;
+    /** 备注 */
+    private String remark;
+    /** 状态：1有效，-1无效 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 打款时间 */
+    private Long payTime;
+    /** 拒绝时间 */
+    private Long refundTime;
+    /** 拒绝原因 */
+    private String refundResaon;
+    /** 提现金额 */
+    private BigDecimal cash;
+    /** 申请时间 */
+    private Long applyTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/mapper/DistributionCashWithdrawalMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.distribution.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal;
+
+/**
+ * 分销业务员提现申请Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+public interface DistributionCashWithdrawalMapper extends BaseMapper<DistributionCashWithdrawal> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/IDistributionCashWithdrawalService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.distribution.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal;
+import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 分销业务员提现申请Service接口
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+public interface IDistributionCashWithdrawalService extends IService<DistributionCashWithdrawal> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	DistributionCashWithdrawalVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<DistributionCashWithdrawalVo> queryList(DistributionCashWithdrawalQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入分销业务员提现申请
+	 * @param bo 分销业务员提现申请新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(DistributionCashWithdrawalAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改分销业务员提现申请
+	 * @param bo 分销业务员提现申请编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(DistributionCashWithdrawalEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -126,6 +126,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         lqw.eq(bo.getEndTime() != null, DistributionActivity::getEndTime, bo.getEndTime());
         lqw.eq(bo.getTempId() != null, DistributionActivity::getTempId, bo.getTempId());
         lqw.eq(bo.getPosterId() != null, DistributionActivity::getPosterId, bo.getPosterId());
+        lqw.orderByDesc(DistributionActivity::getDistributionId);
         List<DistributionActivityVo> voList = entity2Vo(this.list(lqw));
         if (CollectionUtils.isEmpty(voList)){
             return new ArrayList<>();

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionCashWithdrawalServiceImpl.java

@@ -0,0 +1,109 @@
+package com.zhongzheng.modules.distribution.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalEditBo;
+import com.zhongzheng.modules.distribution.bo.DistributionCashWithdrawalQueryBo;
+import com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal;
+import com.zhongzheng.modules.distribution.mapper.DistributionCashWithdrawalMapper;
+import com.zhongzheng.modules.distribution.service.IDistributionCashWithdrawalService;
+import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 分销业务员提现申请Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Service
+public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<DistributionCashWithdrawalMapper, DistributionCashWithdrawal> implements IDistributionCashWithdrawalService {
+
+    @Override
+    public DistributionCashWithdrawalVo queryById(Long id){
+        DistributionCashWithdrawal db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, DistributionCashWithdrawalVo.class);
+    }
+
+    @Override
+    public List<DistributionCashWithdrawalVo> queryList(DistributionCashWithdrawalQueryBo bo) {
+        LambdaQueryWrapper<DistributionCashWithdrawal> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getCwSn()), DistributionCashWithdrawal::getCwSn, bo.getCwSn());
+        lqw.eq(bo.getSellerId() != null, DistributionCashWithdrawal::getSellerId, bo.getSellerId());
+        lqw.eq(bo.getCwStatus() != null, DistributionCashWithdrawal::getCwStatus, bo.getCwStatus());
+        lqw.eq(bo.getStatus() != null, DistributionCashWithdrawal::getStatus, bo.getStatus());
+        lqw.eq(bo.getPayTime() != null, DistributionCashWithdrawal::getPayTime, bo.getPayTime());
+        lqw.eq(bo.getRefundTime() != null, DistributionCashWithdrawal::getRefundTime, bo.getRefundTime());
+        lqw.eq(StrUtil.isNotBlank(bo.getRefundResaon()), DistributionCashWithdrawal::getRefundResaon, bo.getRefundResaon());
+        lqw.eq(bo.getCash() != null, DistributionCashWithdrawal::getCash, bo.getCash());
+        lqw.eq(bo.getApplyTime() != null, DistributionCashWithdrawal::getApplyTime, bo.getApplyTime());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<DistributionCashWithdrawalVo> entity2Vo(Collection<DistributionCashWithdrawal> collection) {
+        List<DistributionCashWithdrawalVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, DistributionCashWithdrawalVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<DistributionCashWithdrawal> page = (Page<DistributionCashWithdrawal>)collection;
+            Page<DistributionCashWithdrawalVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(DistributionCashWithdrawalAddBo bo) {
+        DistributionCashWithdrawal add = BeanUtil.toBean(bo, DistributionCashWithdrawal.class);
+        validEntityBeforeSave(add);
+        add.setCwStatus(0);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        add.setApplyTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(DistributionCashWithdrawalEditBo bo) {
+        DistributionCashWithdrawal update = BeanUtil.toBean(bo, DistributionCashWithdrawal.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(DistributionCashWithdrawal entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionLinkServiceImpl.java

@@ -83,10 +83,11 @@ public class DistributionLinkServiceImpl extends ServiceImpl<DistributionLinkMap
             throw new CustomException("活动ID不能为空");
         }
         if(Validator.isEmpty(bo.getLinkCode())){
-            throw new CustomException("code不能为空");
+            throw new CustomException("链路code不能为空");
         }
         DistributionLink add = BeanUtil.toBean(bo, DistributionLink.class);
         add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionCashWithdrawalVo.java

@@ -0,0 +1,68 @@
+package com.zhongzheng.modules.distribution.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 分销业务员提现申请视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2023-03-25
+ */
+@Data
+@ApiModel("分销业务员提现申请视图对象")
+public class DistributionCashWithdrawalVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 提现申请编号 */
+	@Excel(name = "提现申请编号")
+	@ApiModelProperty("提现申请编号")
+	private String cwSn;
+	/** 业务员ID */
+	@Excel(name = "业务员ID")
+	@ApiModelProperty("业务员ID")
+	private Long sellerId;
+	/** 提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝 */
+	@Excel(name = "提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝")
+	@ApiModelProperty("提现状态 0未审核 1初审通过 2二审同个 3三审通过 4已打款 -1已拒绝")
+	private Integer cwStatus;
+	/** 备注 */
+	@Excel(name = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+	/** 状态：1有效，-1无效 */
+	@Excel(name = "状态：1有效，-1无效")
+	@ApiModelProperty("状态：1有效，-1无效")
+	private Integer status;
+	/** 打款时间 */
+	@Excel(name = "打款时间")
+	@ApiModelProperty("打款时间")
+	private Long payTime;
+	/** 拒绝时间 */
+	@Excel(name = "拒绝时间")
+	@ApiModelProperty("拒绝时间")
+	private Long refundTime;
+	/** 拒绝原因 */
+	@Excel(name = "拒绝原因")
+	@ApiModelProperty("拒绝原因")
+	private String refundResaon;
+	/** 提现金额 */
+	@Excel(name = "提现金额")
+	@ApiModelProperty("提现金额")
+	private BigDecimal cash;
+	/** 申请时间 */
+	@Excel(name = "申请时间")
+	@ApiModelProperty("申请时间")
+	private Long applyTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/bo/WxLoginBody.java

@@ -54,4 +54,6 @@ public class WxLoginBody {
     @ApiModelProperty("用户ID")
     private Long userId;
 
+    @ApiModelProperty("业务员ID")
+    private Long sellerId;
 }

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionCashLogMapper.xml

@@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="fromOrderCashList" parameterType="com.zhongzheng.modules.distribution.bo.DistributionCashLogQueryBo" resultType="com.zhongzheng.modules.distribution.vo.DistributionCashLogVo">
         SELECT
             create_time,
-            diff_num
+            diff_num,
+            related_sn
         FROM
             distribution_cash_log
         WHERE
             type = 1
+          AND related_sn IS NULL
           AND seller_id = #{sellerId}
         ORDER BY id DESC
     </select>

zhongzheng-system/src/main/resources/mapper/modules/distribution/DistributionCashWithdrawalMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.distribution.mapper.DistributionCashWithdrawalMapper">
+
+    <resultMap type="com.zhongzheng.modules.distribution.domain.DistributionCashWithdrawal" id="DistributionCashWithdrawalResult">
+        <result property="id" column="id"/>
+        <result property="cwSn" column="cw_sn"/>
+        <result property="sellerId" column="seller_id"/>
+        <result property="cwStatus" column="cw_status"/>
+        <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="payTime" column="pay_time"/>
+        <result property="refundTime" column="refund_time"/>
+        <result property="refundResaon" column="refund_resaon"/>
+        <result property="cash" column="cash"/>
+        <result property="applyTime" column="apply_time"/>
+    </resultMap>
+
+
+</mapper>