submit

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

@@ -3,7 +3,6 @@ package com.zhongzheng.modules.distribution.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -28,14 +27,10 @@ import com.zhongzheng.modules.distribution.service.IDistributionSellerService;
 import com.zhongzheng.modules.distribution.vo.DistributionCashWithdrawalVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckDetailVo;
 import com.zhongzheng.modules.distribution.vo.DistributionCheckVo;
-import com.zhongzheng.modules.grade.domain.ClassGradeUser;
-import com.zhongzheng.modules.grade.service.impl.UserPeriodServiceImpl;
-import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.system.service.ISysRoleService;
 import com.zhongzheng.modules.system.service.ISysUserRoleService;
 import com.zhongzheng.modules.system.service.ISysUserService;
-import com.zhongzheng.modules.user.domain.UserVisitLog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -274,8 +269,8 @@ public class DistributionCashWithdrawalServiceImpl extends ServiceImpl<Distribut
     @Override
     public boolean payCash(DistributionCheckQueryBo bo) {
         DistributionCashWithdrawal withdrawal = getOne(new LambdaQueryWrapper<DistributionCashWithdrawal>()
-                .eq(DistributionCashWithdrawal::getCwSn, "CW23032517295715731864"));
-        if(withdrawal.getStatus()!=3){
+                .eq(DistributionCashWithdrawal::getCwSn, bo.getCwSn()));
+        if(withdrawal.getCwStatus() != 3){
             throw new CustomException("非法操作");
         }
         DistributionSeller seller = iDistributionSellerService.getOne(new LambdaQueryWrapper<DistributionSeller>()

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

@@ -185,6 +185,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         voList.forEach(item -> {
             DistributionActivityTemplatePoster templatePoster = iDistributionActivityTemplatePosterService.getById(item.getPosterTempId());
             item.setPosterTempName(templatePoster.getName());
+            item.setPosterUrl(templatePoster.getPosterUrl());
         });
         return voList;
     }

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

@@ -54,6 +54,8 @@ public class DistributionActivityTemplateVo {
 	private Long posterTempId;
 	@ApiModelProperty("海报模板")
 	private String posterTempName;
+	@ApiModelProperty("海报路径")
+	private String posterUrl;
 	/** 开始时间 */
 	@Excel(name = "开始时间")
 	@ApiModelProperty("开始时间")