Merge remote-tracking branch 'origin/dev' into dev

puhanshu

2022-03-14 b92edf56e7e25440e7c46b967aa5373a7a8b25c2

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

@@ -319,11 +319,10 @@
                break;
            case 8:
                changeType = ComActIntegralUserTradeDO.changeType.reduce;
                if (integralUserDTO.getActivityType() == 1) {
                    ComActActivityDO actActivityDO2 = comActActivityService.getById(serviceId);
                    if (actActivityDO2 != null) {
                        amount = -actActivityDO2.getCancelDeduct();
                        if (isVolunteer.equals(1)) {
                        if (actActivityDO2.getType()==1) {
                            identityType=3;
                            remark.append("取消志愿者活动扣除积分");
                        } else if(actActivityDO2.getType()==3){
@@ -334,7 +333,7 @@
                            identityType=1;
                            remark.append("取消党员活动扣除积分");
                        }
                    }

                }
//                else {
//                    ComPbActivityDO comPbActivityDO = comBpActivityDAO.selectById(serviceId);