Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/cmsActivity/dao/CmsActivityRepository.java

@@ -43,5 +43,7 @@ public interface CmsActivityRepository extends CyBaseMapper<CmsActivity> {
     Integer addApplicationCount(@Param("businessId") Integer businessId);
     //查询活动报名人数
     Integer selectByActivityId(Integer businessId);
+    //活动已报名人数-1
+    int reduceActivityApplicationCount(Integer businessId);
 }
 

src/main/java/org/rcisoft/business/cmsApplication/service/impl/CmsApplicationServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.rcisoft.business.cmsActivity.dao.CmsActivityRepository;
 import org.rcisoft.business.cmsApplication.entity.CmsApplication;
 import org.rcisoft.business.cmsApplication.dao.CmsApplicationRepository;
 import org.rcisoft.business.cmsApplication.service.CmsApplicationService;
@@ -38,6 +39,8 @@ public class CmsApplicationServiceImpl extends ServiceImpl<CmsApplicationReposit
     private SysUserRepository sysUserRepository;
     @Autowired
     private CyRedisService cyRedisServiceImpl;
+    @Autowired
+    private CmsActivityRepository cmsActivityRepository;
 
     /**
      * 保存 活动
@@ -69,8 +72,13 @@ public class CmsApplicationServiceImpl extends ServiceImpl<CmsApplicationReposit
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel remove(CmsApplication cmsApplication) {
+
+        //删除redis
         cyRedisServiceImpl.del(ORDER_ACTIVITY+':'+cmsApplication.getActivityId()+':'+cmsApplication.getOrderId());
+        //删除报名表数据
         int line = baseMapper.deleteCmsApplication(cmsApplication.getBusinessId());
+        //减掉活动已报名人数
+        cmsActivityRepository.reduceActivityApplicationCount(cmsApplication.getActivityId());
         return new CyPersistModel(line);
     }
 

src/main/resources/mapper/business/cmsActivity.mapper/CmsActivityMapper.xml

@@ -222,6 +222,11 @@
         set flag = #{ entity.flag}
         where business_id = #{entity.businessId}
     </update>
+    <update id="reduceActivityApplicationCount">
+        update cms_activity
+        set application_count = application_count - 1
+        where business_id = #{entity.businessId}
+    </update>
     <select id="selectById"  resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select ca.*
         from cms_activity ca