活动bug修改提交

101captain

2022-03-10 fd2186da74ff7611c02b58f42e3ff41e87a465ca

活动bug修改提交

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java

@@ -212,7 +212,7 @@
            return R.fail("人员类型错误");
        }
        activitySignVO.setType(type);
        return communityService.listActivitySigns(activitySignVO);
        return communityService.listActivitySign(activitySignVO);
    }

    @ApiOperation(value = "活动报名签到情况", response = ActivitySignInRecordVO.class)

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -577,7 +577,7 @@
                AddComActIntegralUserDTO addComActIntegralUserDTO = new AddComActIntegralUserDTO();
                addComActIntegralUserDTO.setUserId(userId);
                addComActIntegralUserDTO.setIntegralType(8);
                addComActIntegralUserDTO.setActivityType(1);
                addComActIntegralUserDTO.setActivityType(actActivityDO.getType());
                addComActIntegralUserDTO.setIsVolunteer(comActActSignDO.getIsVolunteer());
                addComActIntegralUserDTO.setCommunityId(actActivityDO.getCommunityId());
                addComActIntegralUserDTO.setServiceId(activityId);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActIntegralUserTradeServiceImpl.java

@@ -283,7 +283,11 @@
                break;
            case 6:
                identityType = 2;
                remark.append("参与党员活动");
                remark.append("成功参加党员活动奖励积分");
                ComActActivityDO actActivityDO3 = comActActivityService.getById(serviceId);
                if(actActivityDO3 != null) {
                    amount = actActivityDO3.getRewardIntegral();
                }
                break;
            case 7:
                // 查询调查问卷
@@ -319,16 +323,17 @@
                    ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
                    if (actActivityDO2 != null) {
                        amount = -actActivityDO2.getCancelDeduct();
                        if (actActivityDO2.getVolunteerMax() != 0) {
                        if (isVolunteer.equals(1)) {
                            identityType=3;
                            remark.append("取消志愿者活动扣除积分");
                        } else {
                            remark.append("取消居民活动扣除积分");
                        } else if(actActivityDO2.getType()==3){
                            identityType=2;
                            remark.append("取消党员活动扣除积分");
                        }
                    }
                    if (nonNull(isVolunteer) && isVolunteer.equals(1)) {
                        identityType = 3;
                    } else {
                        identityType = 1;
                        else {
                            identityType=1;
                            remark.append("取消党员活动扣除积分");
                        }
                    }
                }
//                else {