Merge remote-tracking branch 'origin/dev' into dev

无关风月

2025-09-01 324ed9fac852bc4117ee0da65a586adef258bd52

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/vo/SiteInfoVO.java

@@ -8,7 +8,7 @@
import java.math.BigDecimal;

@Data
@ApiModel(value = "SiteVO对象", description = "小程序扫一扫-详情页面")
@ApiModel(value = "SiteInfoVO对象", description = "小程序扫一扫-详情页面")
public class SiteInfoVO  {
    @ApiModelProperty(value = "电站名称")
    private String name;

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -647,7 +647,7 @@
        return R.ok(s);
    }*/

    private static final String FILE_DIRECTORY = "/var/files/ldf_files"; // Linux路径
    private static final String FILE_DIRECTORY = "/dev/xvdb/project/upload_files"; // Linux路径
//    private static final String FILE_DIRECTORY = "E://ldf_files"; // Linux路径

    @PostMapping("/upload")
@@ -675,7 +675,7 @@
            File targetFile = new File(filePath);
            file.transferTo(targetFile);
            // 5. 返回可访问的URL（修正路径分隔符为Web格式）
            return R.ok("http://zjrqxny.com/account/app-user/download" + datePath + "/" + UUID+file.getOriginalFilename());
            return R.ok("https://zjrqxny.com/images" + datePath + "/" + UUID+file.getOriginalFilename());
        } catch (IOException e) {
            e.printStackTrace();
            return R.fail("上传文件失败");

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TAccountingStrategyDetailServiceImpl.java

@@ -137,7 +137,7 @@

        // 处理空列表情况
        if (accountingStrategyDetails == null || accountingStrategyDetails.isEmpty()) {
            return false;
            return true;
        }

        // 按开始时间排序
@@ -152,7 +152,7 @@

        // 首尾时间不匹配，不能构成24小时周期
        if (!firstDetail.getStartTime().equals(lastDetail.getEndTime())) {
            return false;
            return true;
        }

        // 检查中间时间段是否连续
@@ -162,11 +162,11 @@

            // 当前时间段的开始时间必须等于前一个时间段的结束时间
            if (!current.getStartTime().equals(previous.getEndTime())) {
                return false;
                return true;
            }
        }

        return true;
        return false;
    }

    @Override

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralController.java

@@ -204,6 +204,7 @@
        try {
            String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
            Map<String, Object> param = new HashMap<>();
//            param.put("scene", "phone=" + phonenumber);
            param.put("scene", "phone=" + phonenumber+",amount="+amount);
            param.put("page", "chargingPile/payMent/payMent");
            param.put("check_path", false);