Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

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

@@ -246,7 +246,7 @@
        }
        orderEvaluate = new TOrderEvaluate();
        BeanUtils.copyProperties(query, orderEvaluate);
        Long userid = tokenService.getLoginUser().getUserid();
        Long userid = tokenService.getLoginUserApplet().getUserId();
        orderEvaluate.setAppUserId(userid);
        if(query.getOrderType() == 1){
            TChargingOrder chargingOrder = chargingOrderService.getById(query.getOrderId());