Merge branch 'hemenkou_dev' into dev

101captain

2022-03-10 dd8aa15e284c9d4c0c858e22f4130d1785261e01

 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)) {
@@ -412,8 +415,8 @@
        }
        if (changeType == ComActIntegralUserTradeDO.changeType.reduce) {
            amount = reduceAmount;
            integralUserDO.setIntegralSum(addIntegral(integralSum + reduceAmount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + reduceAmount));
            integralUserDO.setIntegralSum(addIntegral(integralSum - reduceAmount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum - reduceAmount));
        } else {
            integralUserDO.setIntegralSum(addIntegral(integralSum + amount));
            integralUserDO.setIntegralAvailableSum(addIntegral(integralAvailableSum + amount));