Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

2024-12-02 ecc4e57b4f7c6ecfd6823704688ee786b3350b1f

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1523,7 +1523,7 @@
            if(null != merchandise.getIntegral()){
                pointsMerchandise.setIntegral(merchandise.getIntegral() * goodsNums);
            }
            if(exchangeType.getExchangeType() == 2){
            if(exchangeType.getExchangeType() == 2 || exchangeType.getExchangeType() == 3){
                pointsMerchandise.setCash(merchandise.getCash());
                pointsMerchandise.setCashPayType(exchangeType.getPayType());
            }