修改报名移除

src/main/java/org/rcisoft/business/cmsApplication/controller/CmsApplicationController.java

@@ -54,7 +54,7 @@ public class CmsApplicationController extends CyPaginationController<CmsApplicat
     @Operation(summary = "删除报名表", description = "删除报名表")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
     @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable Integer businessId, CmsApplication cmsApplication) {
+    public CyResult delete(@PathVariable Integer businessId, @RequestBody CmsApplication cmsApplication) {
         cmsApplication.setBusinessId(businessId);
         CyPersistModel data = cmsApplicationServiceImpl.remove(cmsApplication);
         return CyResultGenUtil.builder(data,

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

@@ -7,9 +7,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.rcisoft.business.cmsApplication.entity.CmsApplication;
 import org.rcisoft.business.cmsApplication.dao.CmsApplicationRepository;
 import org.rcisoft.business.cmsApplication.service.CmsApplicationService;
+import org.rcisoft.business.memTraffic.bean.MemTrafficRedisBean;
 import org.rcisoft.business.memTraffic.entity.MemTraffic;
 import org.rcisoft.core.model.CyPageInfo;
 import org.rcisoft.core.model.CyPersistModel;
+import org.rcisoft.core.service.CyRedisService;
 import org.rcisoft.core.util.*;
 import org.rcisoft.sys.wbac.user.dao.SysUserRepository;
 import org.rcisoft.sys.wbac.user.entity.SysUser;
@@ -21,6 +23,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
+import static org.rcisoft.core.util.RedisCons.ORDER_ACTIVITY;
+
 /**
  * @author cy
  * @date 2024年3月25日 下午1:42:40
@@ -32,6 +36,8 @@ public class CmsApplicationServiceImpl extends ServiceImpl<CmsApplicationReposit
 
     @Autowired
     private SysUserRepository sysUserRepository;
+    @Autowired
+    private CyRedisService cyRedisServiceImpl;
 
     /**
      * 保存 活动
@@ -63,9 +69,8 @@ public class CmsApplicationServiceImpl extends ServiceImpl<CmsApplicationReposit
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT)
     @Override
     public CyPersistModel remove(CmsApplication cmsApplication) {
+        cyRedisServiceImpl.del(ORDER_ACTIVITY+':'+cmsApplication.getActivityId()+':'+cmsApplication.getOrderId());
         int line = baseMapper.deleteCmsApplication(cmsApplication.getBusinessId());
-        log.debug(CyUserUtil.getAuthenUsername() + "删除了ID为" +
-                cmsApplication.getBusinessId() + "的活动信息");
         return new CyPersistModel(line);
     }
 

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

@@ -119,6 +119,7 @@
         SELECT activity_id, COUNT(*) AS application_count
         FROM cms_application
         WHERE status = '1'
+        and del_flag = '0'
         GROUP BY activity_id
         ) AS applicationList ON ca.business_id = applicationList.activity_id
         LEFT JOIN oss_info oi ON ca.picture_id = oi.business_id

src/main/resources/mapper/business/cmsApplication.mapper/CmsApplicationMapper.xml

@@ -78,7 +78,8 @@
         ca2.status,
         ca2.application_fee,
         mi.business_id as memberId,
-        mi.mem_nick_name
+        mi.mem_nick_name,
+        ca2.order_id
         FROM cms_application ca2
         LEFT JOIN cms_activity ca1 on ca1.business_id = ca2.activity_id
         Left join mem_info mi on mi.user_id = ca2.user_id