submit

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

@@ -215,6 +215,7 @@ public class DistributionActivityPosterServiceImpl extends ServiceImpl<Distribut
         lqw.eq(StrUtil.isNotBlank(bo.getUrl()), DistributionActivityPoster::getUrl, bo.getUrl());
         lqw.in(bo.getStatus() != null, DistributionActivityPoster::getStatus, bo.getStatus());
         lqw.like(StringUtils.isNotBlank(bo.getName()),DistributionActivityPoster::getName,bo.getName());
+        lqw.orderByDesc(DistributionActivityPoster::getCreateTime);
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformRemindService.java

@@ -57,4 +57,6 @@ public interface IInformRemindService extends IService<InformRemind> {
 	List<CourseUserEducationTypeVo> listGradeService(ClassGradeQueryBo bo);
 
     InformRemindVo getQueryByName(String name);
+
+	InformRemindVo getQueryByNameTenant(String 分销活动提醒, Long id);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -213,11 +213,20 @@ public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, Inf
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
     public InformRemindVo getQueryByName(String name) {
         return queryByName(name);
     }
 
+    @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
+    public InformRemindVo getQueryByNameTenant(String name, Long id) {
+        InformRemind db = getOne(new LambdaQueryWrapper<InformRemind>().eq(InformRemind::getRemind, name).eq(InformRemind::getTenantId,id).last("limit 1"));
+        InformRemindVo informRemindVo = BeanUtil.toBean(db, InformRemindVo.class);
+        List<InformRemindBusinessVo> informRemindBusinessVos = iInformRemindBusinessService.selectBusiness(informRemindVo.getId());
+        informRemindVo.setInformRemindBusiness(informRemindBusinessVos);
+        return informRemindVo;
+    }
+
     private List<CourseUserEducationTypeVo> entity2EducationVo(Collection<CourseEducationTypeVo> collection) {
         List<CourseUserEducationTypeVo> voList = collection.stream()
                 .map(any -> BeanUtil.toBean(any, CourseUserEducationTypeVo.class))

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

@@ -47,6 +47,7 @@ public class DistributionActivityTemplatePosterServiceImpl extends ServiceImpl<D
         LambdaQueryWrapper<DistributionActivityTemplatePoster> lqw = Wrappers.lambdaQuery();
         lqw.like(StrUtil.isNotBlank(bo.getName()), DistributionActivityTemplatePoster::getName, bo.getName());
         lqw.in(bo.getStatus() != null, DistributionActivityTemplatePoster::getStatus, bo.getStatus());
+        lqw.orderByDesc(DistributionActivityTemplatePoster::getCreateTime);
         return entity2Vo(this.list(lqw));
     }
 

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

@@ -434,7 +434,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             SysRole role = iSysRoleService.getOneSysRole("seller_admin",id);
             if (ObjectUtils.isNotNull(role)){
                 List<SysUserRole> sysUserRoles = iSysUserRoleService.getList(role.getRoleId(),id);
-                InformRemindVo informRemindVo = informRemindService.getQueryByName("分销活动提醒");
+                InformRemindVo informRemindVo = informRemindService.getQueryByNameTenant("分销活动提醒",id);
                 if (CollectionUtils.isNotEmpty(sysUserRoles) && ObjectUtils.isNotNull(informRemindVo)){
                     sysUserRoles.forEach(item -> {
                         InformSysUserAddBo informUserAddBo = new InformSysUserAddBo();

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

@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code`
                 LEFT JOIN `order` o ON dr.order_sn = o.order_sn
         WHERE
-            dr.`status` = 1
+            dr.`status` = 1 AND dr.cash_status != 3
         <if test = "distributionId != null and distributionId != ''" >
             AND d.distribution_id = #{distributionId}
         </if >

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

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN distribution_activity d ON dr.distribution_code = d.`code` AND dr.tenant_id = d.tenant_id
         LEFT JOIN `order` o ON dr.order_sn = o.order_sn
         WHERE
-        dr.`status` = 1
+        dr.`status` = 1 AND dr.cash_status != 3
         <if test = "distributionId != null and distributionId != ''" >
             AND d.distribution_id = #{distributionId}
         </if >