Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-22 1110455c307fa0a01848a313f0002a66306cdc8c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -1164,6 +1164,7 @@
         appUserIntegralChange.setCurrentIntegral(appUser1.getPoints() + num1);
         appUserIntegralChange.setCreateTime(LocalDateTime.now());
         appUserIntegralChange.setOrderCode(chargingOrder.getCode());
         appUserIntegralChange.setExtension(chargingOrder.getId().toString());
         appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
         
         appUser1.setPoints(appUser1.getPoints() + num1);
@@ -1991,6 +1992,7 @@
         appUserIntegralChange.setCurrentIntegral(appUser.getPoints());
         appUserIntegralChange.setCreateTime(LocalDateTime.now());
         appUserIntegralChange.setOrderCode(chargingOrder.getCode());
         appUserIntegralChange.setExtension(chargingOrder.getId().toString());
         appUserClient.updateAppUser(appUser);
         appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
      }