Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

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

@@ -400,6 +400,9 @@
            if (amount < 0) {
                reduceAmount = integralParty - integralPartyNow;
            }
            if(amount>0){
                integralUserDO.setIntegralPartyTime(integralUserDO.getIntegralPartyTime()+integralUserDTO.getIntegralPartyTime());
            }
            integralUserDO.setIntegralParty(integralPartyNow);
            integralUserDO.setIntegralAvailableParty(addIntegral(integralUserDO.getIntegralAvailableParty() + amount));
        } else if (identityType.equals(ComActIntegralUserTradeDO.identityType.zyz)) {