Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-08-19 62d2377c27bf65a048a7c104b256efcd32ad2319

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

@@ -258,13 +258,13 @@
                    return R.fail("未查询到用户信息,记录积分失败");
                }
                //判断调查问卷调查的对象是什么身份，如果是党员和志愿者两种身份，则记录志愿者积分
                if(questnaireDO.getForParty() && integralUser.getIsPartymember().equals(1)){
                if(questnaireDO.getForParty().equals(1) && integralUser.getIsPartymember().equals(1)){
                    identityType = 2;
                    if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
                    if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
                        identityType = 3;
                    }
                }
                if(questnaireDO.getForVolunteer() && integralUser.getIsVolunteer().equals(1)){
                if(questnaireDO.getForVolunteer().equals(1) && integralUser.getIsVolunteer().equals(1)){
                    identityType = 3;
                }
                remark.append("参与调查问卷奖励积分");