Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

无关风月

2025-02-13 b69f7d42b91856b9448676a51eefef6b36f6bdb3

Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

 bankapi/pom.xml

@@ -20,10 +20,6 @@
    <dependencies>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-framework</artifactId>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-common</artifactId>
        </dependency>
        <dependency>
@@ -32,33 +28,4 @@
            <version>${httpclient_version}</version>
        </dependency>
    </dependencies>
    <build>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>2.5.15</version>
                <configuration>
                    <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
                </configuration>
                <executions>
                    <execution>
                        <goals>
                            <goal>repackage</goal>
                        </goals>
                    </execution>
                </executions>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>3.1.0</version>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <warName>${project.artifactId}</warName>
                </configuration>
            </plugin>
        </plugins>
        <finalName>${project.artifactId}</finalName>
    </build>
</project>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/BankOutController.java

@@ -23,8 +23,7 @@
    @PostMapping(value = "payCallback")
    public @ResponseBody String payCallback(HttpServletRequest request){
        CovertPayBackResult result = bankService.covertPayCallBack(request, (billRequest) -> {
            String orderno = billRequest.getMessage().getInfo().getInput1();

            tBillService.completePay(billRequest);
            return true;
        });
        return result.getBack();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java

@@ -4,12 +4,15 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,19 +34,28 @@
    @Autowired
    TBillService tBillService;

    @PreAuthorize("@ss.hasPermi('system:bill:list')")
    @PostMapping("list")
    @ApiOperation("分页查询账单列表")
    public R<PageInfo<TBillDto>> list(@RequestBody TBillQuery query){
        PageInfo<TBillDto> pageInfo = tBillService.queryPage(query);
        return R.ok(pageInfo);
    }

    @PreAuthorize("@ss.hasPermi('system:bill:add')")
    @PostMapping("add")
    @ApiOperation("新增账单")
    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){
        tBillService.saveBill(bill);
        return R.ok();
    }


    @PreAuthorize("@ss.hasPermi('system:bill:checkOfflinePay')")
    @ApiOperation("确认线下缴费")
    @PostMapping("checkOfflinePay")
    public R checkOfflinePay(@Validated @RequestBody  OfflinePayCheckDto dto){
        tBillService.checkOfflinePay(dto);
        return R.ok();
    }


}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java

@@ -158,7 +158,7 @@
            payMoney = payMoney.add(tBill.getPayFeesMoney()).add(tBill.getPayableFeesPenalty());
        }
        TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordService.lambdaQuery().eq(TCheckAcceptRecord::getContractId, id).one();
        res.setCheckResult(tCheckAcceptRecord.getCheckResult());
        res.setCheckResult(Objects.nonNull(tCheckAcceptRecord)?tCheckAcceptRecord.getCheckResult():false);
        res.setPayMoney(payMoney);

        return R.ok(res);
@@ -169,6 +169,16 @@
    public R<Boolean> updateContractStatus(String id) {
        TContract contract = contractService.getById(id);
        contract.setStatus("1");
        contractService.updateById(contract);
        return R.ok();
    }
    @Log(title = "合同管理-确认结算", businessType =  BusinessType.UPDATE)
    @ApiOperation(value = "确认结算")
    @PostMapping(value = "/confirmSettlement")
    public R<Boolean> confirmSettlement(String id) {
        TContract contract = contractService.getById(id);
        contract.setStatus("8");
        contractService.updateById(contract);
        return R.ok();
    }
    @ApiOperation(value = "终止合同剩余未缴费账单列表")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/interceptor/MybatisInterceptor.java

@@ -54,7 +54,7 @@
                    //注入创建时间
                    if ("createTime".equals(field.getName())) {
                        field.setAccessible(true);
                        field.set(parameter, LocalDateTime.now());
                        field.set(parameter, new Date());
                        field.setAccessible(false);
                    } 
                } catch (Exception e) {
@@ -77,7 +77,7 @@
                    }
                    if ("updateTime".equals(field.getName())) {
                        field.setAccessible(true);
                        field.set(parameter, LocalDateTime.now());
                        field.set(parameter, new Date());
                        field.setAccessible(false);
                    }
                } catch (Exception e) {

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/COSController.java

New file
@@ -0,0 +1,55 @@
package com.ruoyi.web.controller.api;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.web.controller.tool.TencentCosUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;

/**
 * @author HJL
 * @version 1.0
 * @since 2024-05-30 9:27
 */
@RestController
@RequestMapping("/cos")
@Api(tags = "公共-文件上传")
public class COSController {

    @Resource
    private TencentCosUtil tencentCosUtil;

    @PostMapping("/upload")
    @ApiOperation(value = "文件上传", tags = "公共-文件上传")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
    })
    public R<String> upload(@RequestParam("file") MultipartFile file) {
        String url = tencentCosUtil.upLoadFile(file);
        return R.ok(url, url);
    }
    @PostMapping("/downloadImg")
    @ApiOperation(value = "文件下载", tags = "公共-文件下载")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "文件url", name = "url", dataType = "String", required = true)
    })
    public String downloadImg(@RequestParam("url") String url) {
       return tencentCosUtil.downLoadFileImg(url);
    }
    @PostMapping("/download")
    @ApiOperation(value = "文件下载", tags = "公共-文件下载")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "文件url", name = "url", dataType = "String", required = true)
    })
    public void download(@RequestParam("url") String url) {
        tencentCosUtil.downLoadFile(url);
    }
}

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java

@@ -16,6 +16,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -52,21 +53,25 @@

    @ApiOperation(value = "线下支付")
    @PostMapping("offlinePay")
    @Transactional(rollbackFor = Exception.class)
    public R offlinePay(@Validated @RequestBody OfflinePayDto dto){
        List<TBill> tBills = tBillService.listByIds(dto.getBillIds());
        TBillConfirm confirm = new TBillConfirm();
        confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
        confirm.setVoucher(dto.getVoucher());
        confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
        confirm.setPayTime(dto.getPayTime());
        tBillConfirmService.save(confirm);
        for (TBill tBill : tBills) {
            TBill save = new TBill();
            save.setId(tBill.getId());
            save.setPayFeesType(2);
            save.setVoucher(dto.getVoucher());
            save.setPayFeesStatus("2");
            tBillService.lockAndUpdateInfo(save);
            save.setConfirmId(confirm.getId());
            tBillService.lockAndUpdateInfo(save,1);
        }
        TBillConfirm confirm = new TBillConfirm();
        confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
        confirm.setVoucher(dto.getVoucher());
        confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
        tBillConfirmService.save(confirm);

        return R.ok();
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java

@@ -90,9 +90,14 @@
            billVO.setHouse(houseService.getById(contract.getHouseId()));
            billVO.setMonthRent(contract.getMonthRent());
            billVO.setPayType(contract.getPayType());
            billVO.setDeposit(contract.getDeposit());
            billVO.setPartyOnePerson(contract.getPartyOnePerson());
            billVO.setPartyOnePhone(contract.getPartyOnePhone());
            billVO.setConcatStartTime(contract.getStartTime());
            billVO.setConcatEndTime(contract.getEndTime());
        });
        billVO.setBillType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BILL_TYPE,billVO.getBillType()));
        billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus()));
//        billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus()));
        return R.ok(billVO);
    }


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TFaultRepairMessageController.java

@@ -1,9 +1,26 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TFaultRepairMessageDTO;
import com.ruoyi.system.model.*;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TFaultAreaDicVO;
import com.ruoyi.system.vo.TItemTypeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -13,9 +30,94 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "报修管理")
@RestController
@RequestMapping("/t-fault-repair-message")
public class TFaultRepairMessageController {

    private final TFaultRepairMessageService tFaultRepairMessageService;
    private final TItemService itemService;
    private final TItemTypeService itemTypeService;
    private final TFaultAreaDicService faultAreaDicService;
    private final TFaultDescribeDicService faultDescribeDicService;
    private final TokenService tokenService;
    private final TContractService contractService;
    private final THouseService houseService;

    @Autowired
    public TFaultRepairMessageController(TFaultRepairMessageService tFaultRepairMessageService, TItemService itemService, TItemTypeService itemTypeService, TFaultAreaDicService faultAreaDicService, TFaultDescribeDicService faultDescribeDicService, TokenService tokenService, TContractService contractService, THouseService houseService) {
        this.tFaultRepairMessageService = tFaultRepairMessageService;
        this.itemService = itemService;
        this.itemTypeService = itemTypeService;
        this.faultAreaDicService = faultAreaDicService;
        this.faultDescribeDicService = faultDescribeDicService;
        this.tokenService = tokenService;
        this.contractService = contractService;
        this.houseService = houseService;
    }

    /**
     * 获取维修物品二级结构
     */
    @ApiOperation(value = "获取维修物品二级结构")
    @PostMapping(value = "/getItemList")
    public R<List<TItemTypeVO>> getItemList() {
        List<TItemTypeVO> itemTypes = itemTypeService.getItemList();
        List<TItem> items = itemService.list();
        itemTypes.forEach(itemType -> {
            itemType.setItemList(items.stream().filter(item -> itemType.getId().equals(item.getTypeId())).collect(Collectors.toList()));
        });
        return R.ok(itemTypes);
    }

    /**
     * 获取故障区域列表
     */
    @ApiOperation(value = "获取故障区域二级结构")
    @PostMapping(value = "/getAreaDicList")
    public R<List<TFaultAreaDicVO>> getAreaDicList() {
        List<TFaultAreaDicVO> faultAreaDicVOS = faultAreaDicService.getAreaDicList();
        List<TFaultDescribeDic> faultDescribeDicList = faultDescribeDicService.list();
        faultAreaDicVOS.forEach(areaDicVO -> {
            areaDicVO.setFaultDescribeDicList(faultDescribeDicList.stream().filter(item -> areaDicVO.getId().equals(item.getFaultId())).collect(Collectors.toList()));
        });
        return R.ok(faultAreaDicVOS);
    }

    /**
     * 通过当前租户查询合同房源信息
     */
    @ApiOperation(value = "通过当前租户查询合同房源信息")
    @PostMapping(value = "/getConcatByTenantId")
    public R<List<TContract>> getConcatByTenantId() {

//        Long userId = tokenService.getLoginUser().getUserId();
        String tenantId = "1881967035070177281";
        // 查询合同信息
        List<TContract> list = contractService.list(Wrappers.lambdaQuery(TContract.class)
                .eq(TContract::getTenantId, tenantId)
                .eq(TContract::getStatus, 4));
        if(CollectionUtils.isEmpty(list)){
            return R.ok(list);
        }
        List<String> houseIds = list.stream().map(TContract::getHouseId).collect(Collectors.toList());
        List<THouse> houseList = houseService.list(Wrappers.lambdaQuery(THouse.class)
                .in(THouse::getId, houseIds));
        list.forEach(item -> {
            item.setHouseName(houseList.stream().filter(house -> house.getId().equals(item.getHouseId())).findFirst().orElse(new THouse()).getHouseName());
        });
        return R.ok(list);
    }

    /**
     * 添加报修信息
     */
    @ApiOperation(value = "添加报修信息")
    @PostMapping(value = "/addFault")
    public R<String> addFault(@RequestBody TFaultRepairMessageDTO dto) {
        tFaultRepairMessageService.save(dto);
        return R.ok();
    }

}


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TInformationController.java

@@ -2,19 +2,16 @@


import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;
import com.ruoyi.system.service.TInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -30,9 +27,11 @@
public class TInformationController {

    private final TInformationService informationService;
    private final RedisCache redisCache;
    @Autowired
    public TInformationController(TInformationService informationService) {
    public TInformationController(TInformationService informationService, RedisCache redisCache) {
        this.informationService = informationService;
        this.redisCache = redisCache;
    }

    /**
@@ -44,5 +43,16 @@
        return R.ok(informationService.pageList(query));
    }

    /**
     * 获取资讯管理详情
     */
    @ApiOperation(value = "获取资讯管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TInformation> getDetailById(@RequestParam String id) {
        // 处理查看次数
        redisCache.increment(Constants.INFORMATION_VIEW + id);
        return R.ok(informationService.getById(id));
    }

}


 ruoyi-applet/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java

New file
@@ -0,0 +1,187 @@
package com.ruoyi.web.controller.tool;

import com.qcloud.cos.COSClient;
import com.qcloud.cos.ClientConfig;
import com.qcloud.cos.auth.BasicCOSCredentials;
import com.qcloud.cos.auth.COSCredentials;
import com.qcloud.cos.http.HttpProtocol;
import com.qcloud.cos.model.ObjectMetadata;
import com.qcloud.cos.model.PutObjectResult;
import com.qcloud.cos.region.Region;
import com.ruoyi.common.utils.WebUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Base64;
import java.util.UUID;

/**
 * @author HJL
 */
@Component
public class TencentCosUtil {

    /**
     * COS的SecretId
     */
    @Value("${cos.client.accessKey}")
    private String secretId;
    /**
     * COS的SecretKey
     */
    @Value("${cos.client.secretKey}")
    private String secretKey;
    /**
     * 文件上传后访问路径的根路径，后面要最佳文件名字与类型
     */
    @Value("${cos.client.rootSrc}")
    private String rootSrc;
    /**
     * 上传的存储桶的地域
     */
    @Value("${cos.client.bucketAddr}")
    private String bucketAddr;
    /**
     * 存储桶的名字，是自己在存储空间自己创建的，我创建的名字是：qq-test-1303******
     */
    @Value("${cos.client.bucket}")
    private String bucketName;
    /**
     * 文件存放位置
     */
    @Value("${cos.client.location}")
    private String location;

    /**
     * 1.调用静态方法getCosClient()就会获得COSClient实例
     * 2.本方法根据永久密钥初始化 COSClient的，官方是不推荐，官方推荐使用临时密钥，是可以限制密钥使用权限，创建cred时有些区别
     *
     * @return COSClient实例
     */
    private COSClient getCosClient() {
        // 1 初始化用户身份信息（secretId, secretKey）。
        COSCredentials cred = new BasicCOSCredentials(secretId, secretKey);
        // 2.1 设置存储桶的地域（上文获得）
        Region region = new Region(bucketAddr);
        ClientConfig clientConfig = new ClientConfig(region);
        // 2.2 使用https协议传输
        clientConfig.setHttpProtocol(HttpProtocol.https);
        // 生成 cos 客户端
        return new COSClient(cred, clientConfig);
    }

    /**
     * 只要调用静态方法upLoadFile(MultipartFile multipartFile)就可以获取上传后文件的全路径
     *
     * @param file
     * @return 返回文件的浏览全路径
     */
    public String upLoadFile(MultipartFile file) {
        try {
            // 获取上传的文件的输入流
            InputStream inputStream = file.getInputStream();
            // 避免文件覆盖，获取文件的原始名称，如123.jpg,然后通过截取获得文件的后缀，也就是文件的类型
            String originalFilename = file.getOriginalFilename();
            //获取文件的类型
            String fileType = originalFilename.substring(originalFilename.lastIndexOf("."));
            //使用UUID工具  创建唯一名称，放置文件重名被覆盖，在拼接上上命令获取的文件类型
            String fileName = UUID.randomUUID() + fileType;
            // 指定文件上传到 COS 上的路径，即对象键。最终文件会传到存储桶名字中的images文件夹下的fileName名字
            String key = location+"/" + fileName;
            // 创建上传Object的Metadata
            ObjectMetadata objectMetadata = new ObjectMetadata();
            // - 使用输入流存储，需要设置请求长度
            objectMetadata.setContentLength(inputStream.available());
            // - 设置缓存
            objectMetadata.setCacheControl("no-cache");
            // - 设置Content-Type
            objectMetadata.setContentType(fileType);
            //上传文件
            PutObjectResult putResult = getCosClient().putObject(bucketName, key, inputStream, objectMetadata);
            // 创建文件的网络访问路径
            String url = rootSrc + key;
            //关闭 cosClient，并释放 HTTP 连接的后台管理线程
            getCosClient().shutdown();
            return url;
        } catch (Exception e) {
            e.printStackTrace();
            // 发生IO异常、COS连接异常等，返回空
            return null;
        }
    }

    /**
     * 下载文件
     * @param file
     * @return
     */
    public void downLoadFile(String file) {
        HttpServletResponse response = WebUtils.response();
        String replace = file.replace(rootSrc, "");
        response.setHeader("Access-Control-Expose-Headers","File-Type");
        COSCredentials cred = new BasicCOSCredentials(
                secretId,
                secretKey);
        // 2.1 设置存储桶的地域（上文获得）
        Region region = new Region(bucketAddr);
        ClientConfig clientConfig = new ClientConfig(region);
        // 2.2 使用https协议传输
        clientConfig.setHttpProtocol(HttpProtocol.https);
        COSClient cosClient = new COSClient(cred, clientConfig);
        try {
            // 5. 下载文件并获取输入流
            InputStream inputStream = cosClient.getObject(bucketName, replace).getObjectContent();
            ServletOutputStream outputStream = response.getOutputStream();
            // 6. 处理输入流，例如读取内容或保存到本地文件
            // 这里仅作示例，实际应用中需要根据需求处理输入流
            byte[] buffer = new byte[1024];
            int len;
            while ((len = inputStream.read(buffer)) != -1) {
                // 处理读取到的数据
                outputStream.write(buffer, 0, len);
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            // 7. 关闭输入流
            cosClient.shutdown();
        }
    }
    public String downLoadFileImg(String file) {
        byte[] data = null;
        String replace = file.replace(rootSrc, "");
        COSCredentials cred = new BasicCOSCredentials(
                secretId,
                secretKey);
        // 2.1 设置存储桶的地域（上文获得）
        Region region = new Region(bucketAddr);
        ClientConfig clientConfig = new ClientConfig(region);
        // 2.2 使用https协议传输
        clientConfig.setHttpProtocol(HttpProtocol.https);
        COSClient cosClient = new COSClient(cred, clientConfig);
        try {
            // 5. 下载文件并获取输入流
            InputStream inputStream = cosClient.getObject(bucketName, replace).getObjectContent();
            ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
            // 6. 处理输入流，例如读取内容或保存到本地文件
            byte[] buffer = new byte[1024];
            int len;
            while ((len = inputStream.read(buffer)) != -1) {
                // 处理读取到的数据
                swapStream.write(buffer, 0, len);
            }
            data = swapStream.toByteArray();
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            // 7. 关闭输入流
            cosClient.shutdown();
        }
        return Base64.getEncoder().encodeToString(data);
    }
}

 ruoyi-applet/src/main/resources/application-prod.yml

@@ -206,3 +206,11 @@
    accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
    signName: "四川金达通信工程"
    templateCode: "SMS_293985284"
cos:
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    location: xizang

 ruoyi-applet/src/main/resources/application-test.yml

@@ -205,3 +205,11 @@
    accessKeySecret: 0SRb6XGkciQDPWn2rYqbJtq2qRMDY8
    signName: "四川金达通信工程"
    templateCode: "SMS_293985284"
cos:
  client:
    accessKey: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
    secretKey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
    bucket: xzgttest-1305134071
    bucketAddr: ap-chengdu
    rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
    location: xizang

 ruoyi-applet/src/main/resources/mybatis-config.xml

@@ -10,7 +10,7 @@
        <setting name="cacheEnabled" value="true"/>
        <!-- 延迟加载的全局开关。当开启时，所有关联对象都会延迟加载。默认 false  -->
        <!-- <setting name="lazyLoadingEnabled" value="true"/> -->
        <setting name="mapUnderscoreToCamelCase" value="false"/><!--是否将map下划线方式转为驼峰式命名-->
        <setting name="mapUnderscoreToCamelCase" value="true"/><!--是否将map下划线方式转为驼峰式命名-->
        <!-- 当开启时，任何方法的调用都会加载该对象的所有属性。默认 false，可通过select标签的 fetchType来覆盖-->
        <!-- <setting name="aggressiveLazyLoading" value="false"/>-->
        <!--  Mybatis 创建具有延迟加载能力的对象所用到的代理工具，默认JAVASSIST -->

 ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java

@@ -41,4 +41,10 @@
     * 登录账户密码错误次数 redis key
     */
    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";


    public static final String BILL_UPDATE_LOCK_KEY = "bill_update_lock:";


    public static final String COMPLETE_PAY_LOCK_KEY = "complete_pay_lock:";
}

 ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -128,6 +128,10 @@
     * LDAPS 远程方法调用
     */
    public static final String LOOKUP_LDAPS = "ldaps:";
    /**
     * LDAPS 远程方法调用
     */
    public static final String INFORMATION_VIEW = "information_view:";

    /**
     * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）

 ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

@@ -289,6 +289,35 @@
    }

    /**
     * 尝试加锁
     *
     * @param lockKey   锁的key
     * @param requestId 锁的持有者标识符（如UUID）
     * @param expireTime 锁的过期时间（秒）
     * @return 加锁成功返回true，否则返回false
     */
    public boolean trylockLoop(String lockKey, String requestId,long expireTime) {
        String lockKeyWithPrefix = LOCK_PREFIX + lockKey;
        // 使用SET命令的NX和PX选项来加锁
        Boolean result = false;
        int num = 50;
        while (num>0){
            result = redisTemplate.opsForValue().setIfAbsent(lockKeyWithPrefix, requestId, expireTime, TimeUnit.SECONDS);
            if (result){
                break;
            }
            try {
                TimeUnit.MILLISECONDS.sleep(200);
            } catch (InterruptedException e) {
                throw new RuntimeException(e);
            }
            num--;
        }
        return result;
    }


    /**
     * 解锁
     *
     * @param lockKey   锁的key
@@ -301,4 +330,14 @@
        Long result = (Long) redisTemplate.execute(UNLOCK_SCRIPT, Collections.singletonList(lockKeyWithPrefix), requestId);
        return result != null && result == 1L;
    }

    /**
     * 自增
     * @param key 要加一的键
     */
    public int increment(String key) {
        // +1 操作
        return redisTemplate.opsForValue().increment(key).intValue();
    }

}

 ruoyi-system/pom.xml

@@ -74,7 +74,11 @@
            <groupId>org.apache.tomcat.embed</groupId>
            <artifactId>tomcat-embed-core</artifactId>
        </dependency>

        <dependency>
            <groupId>org.taxi591</groupId>
            <artifactId>bankapi</artifactId>
            <version>1.0.0-SNAPSHOT</version>
        </dependency>
    </dependencies>

</project>

 ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java

New file
@@ -0,0 +1,40 @@
package com.ruoyi.system.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
public class OfflinePayCheckDto implements Serializable {
    /**
     * 账单ID列表
     */
    @ApiModelProperty("账单ID列表，管理员处理后的")
    @NotEmpty(message = "账单列表不能为空")
    private List<String> billIds;
    @ApiModelProperty("实际支付金额")
    @NotNull(message = "实际支付金额不能为空")
    private BigDecimal amount;

    @ApiModelProperty("确认单ID")
    @NotNull(message = "确认单ID不能为空")
    private String confirmId;

    @ApiModelProperty("银行流水号，用于生成流水")
    @NotEmpty(message = "银行流水号不能为空")
    private String bankSerilNum;

    @ApiModelProperty("支付人")
    private String payer;
    @ApiModelProperty("支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime payTime;

}

 ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java

@@ -1,11 +1,13 @@
package com.ruoyi.system.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

@Data
@@ -32,5 +34,9 @@
    @NotEmpty(message = "凭证文件不能为空")
    private String voucher;

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date payTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TFaultRepairMessageDTO.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.dto;

import com.ruoyi.system.model.TFaultRepairMessage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "报修dto")
public class TFaultRepairMessageDTO extends TFaultRepairMessage {
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFaultAreaDicMapper.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.vo.TFaultAreaDicVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -28,4 +29,9 @@
     */
    List<TFaultAreaDic> pageList(@Param("query")TFaultAreaDicQuery query, @Param("pageInfo")PageInfo<TFaultAreaDic> pageInfo);

    /**
     * 查询列表
     * @return
     */
    List<TFaultAreaDicVO> getAreaDicList();
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TItemTypeMapper.java

@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.vo.TItemTypeVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -25,4 +26,8 @@
     * @return
     */
    List<TItemType> pageList(@Param("query") TItemTypeQuery query, @Param("pageInfo")PageInfo<TItemType> pageInfo);

    List<TItemTypeVO> getItemList();


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBankFlow.java

@@ -9,6 +9,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -36,15 +37,15 @@

    @ApiModelProperty(value = "流水金额")
    @TableField("flow_money")
    private Double flowMoney;
    private BigDecimal flowMoney;

    @ApiModelProperty(value = "抵扣金额")
    @TableField("deduction_money")
    private Double deductionMoney;
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remaining_money")
    private Double remainingMoney;
    private BigDecimal remainingMoney;

    @ApiModelProperty(value = "支付时间")
    @TableField("pay_time")

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java

@@ -18,6 +18,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.data.annotation.Transient;
import springfox.documentation.annotations.ApiIgnore;

/**
 * <p>
@@ -106,5 +107,19 @@
    @TableField("voucher")
    private String voucher;

    @ApiModelProperty(value = "t_bill_confirm表确认单关联ID")
    @TableField("confirm_id")
    private String confirmId;

    /**
     * 抵扣金额
     */
    @TableField(exist = false)
    private BigDecimal deductionMoney;
    /**
     * 抵扣前欠费金额
     */
    @TableField(exist = false)
    private BigDecimal preOutstand;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java

@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -42,5 +45,14 @@
    @TableField("voucher")
    private String voucher;

    @ApiModelProperty(value = "用户ID")
    @TableField("user_id")
    private String userId;

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private Date payTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java

@@ -133,6 +133,16 @@
    @TableField("remark")
    private String remark;

    /**
     * 1    待提交
     * 2    待审批
     * 3    未签订
     * 4    已签订
     * 5    已驳回
     * 6    已终止
     * 7    待结算
     * 8    已结算
     */
    @ApiModelProperty(value = "状态 待提交 待审批 未签订 已签订....")
    @TableField("status")
    private String status;
@@ -151,5 +161,8 @@
    @ApiModelProperty(value = "合计年租金")
    @TableField("total_year")
    private BigDecimal totalYear;
    @ApiModelProperty(value = "房屋名称")
    @TableField(exist = false)
    private String houseName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFaultRepairMessage.java

@@ -34,13 +34,17 @@
    private String id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private String appUserId;
    @TableField("tenant_id")
    private String tenantId;

    @ApiModelProperty(value = "物品id")
    @TableField("item_id")
    private String itemId;

    @ApiModelProperty(value = "合同id")
    @TableField("contract_id")
    private String contractId;

    @ApiModelProperty(value = "故障区域")
    @TableField("fault_area_name")
    private String faultAreaName;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TFlowManagement.java

@@ -51,6 +51,10 @@
    @TableField("deduction_money")
    private BigDecimal deductionMoney;

    @ApiModelProperty(value = "抵扣前欠费金额")
    @TableField("pre_outstand")
    private BigDecimal preOutstand;

    @ApiModelProperty(value = "剩余金额")
    @TableField("remaining_money")
    private BigDecimal remainingMoney;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java

@@ -67,4 +67,8 @@
    @TableField("attachment_name")
    private String attachmentName;

    @ApiModelProperty(value = "查看次数")
    @TableField(exist = false)
    private Integer viewCount;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TPayOrder.java

@@ -11,6 +11,7 @@

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
 * <p>
@@ -58,7 +59,7 @@

    @ApiModelProperty(value = "支付时间")
    @TableField("pay_time")
    private LocalDateTime payTime;
    private Date payTime;

    @ApiModelProperty(value = "支付方式")
    @TableField("pay_type")
@@ -74,15 +75,12 @@

    @ApiModelProperty(value = "支付的回调时间")
    @TableField("callback_time")
    private LocalDateTime callbackTime;
    private Date callbackTime;

    @ApiModelProperty(value = "订单创建时间")
    @TableField("create_time")
    private LocalDateTime createTime;
    @ApiModelProperty(value = "订单状态：0.待支付  1.已支付")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "订单更新时间")
    @TableField("update_time")
    private LocalDateTime updateTime;


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java

@@ -2,10 +2,17 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.taxi591.bankapi.dto.ChargeBillRequest;

import java.math.BigDecimal;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;

import java.util.List;

@@ -21,10 +28,34 @@

    PageInfo<TBillDto> queryPage(TBillQuery query);

    Boolean lockAndUpdateInfo(TBill save);
    /**
     *
     * 更新类型  1.仅更新信息及状态 2.更新金额及状态
     * 为1时，仅更新非金额之外的信息及状态
     * 为2时，传入的金额，是需要增加或减少的金额，非计算后的金额
     * 当账单状态为已缴费后，不做任何更新
     * @param tBill
     * @param type
     * @return
     */
    TBill lockAndUpdateInfo(TBill tBill,Integer type);

    /**
     * 批量对账单进行金额的分配
     * @param billIds
     * @param amount 支付的总金额，元
     * @param consumer 处理完账单后的回调，参数是处理完成后，最新的bill信息
     * @return
     */
    Boolean lockAndUpdateByAmountBatch(List<TBill> billIds, BigDecimal amount, Consumer<TBill> consumer);


    void saveBill(TbillSaveDto bill);

    boolean checkOfflinePay(OfflinePayCheckDto dto);

    void completePay(ChargeBillRequest billRequest);

    /**
     * 查询账单id列表
     * @param query

 ruoyi-system/src/main/java/com/ruoyi/system/service/TFaultAreaDicService.java

@@ -4,6 +4,9 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.vo.TFaultAreaDicVO;

import java.util.List;

/**
 * <p>
@@ -28,4 +31,7 @@
     * @return
     */
    boolean isExit(TFaultAreaDic dto);

    List<TFaultAreaDicVO> getAreaDicList();

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TItemTypeService.java

@@ -4,6 +4,9 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.TItemType;
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.vo.TItemTypeVO;

import java.util.List;

/**
 * <p>
@@ -28,4 +31,6 @@
     * @return
     */
    PageInfo<TItemType> pageList(TItemTypeQuery query);

    List<TItemTypeVO> getItemList();
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TOrderBillService.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TOrderBill;

import java.util.List;

/**
 * <p>
 * 订单表与账单的关联表 服务类
@@ -13,4 +15,6 @@
 */
public interface TOrderBillService extends IService<TOrderBill> {

    List<TOrderBill> getByOrderNo(String orderNo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java

@@ -1,24 +1,26 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.constant.AmountConstant;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.mapper.TBillMapper;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TBillQuery;
import com.ruoyi.system.service.TBillDetailService;
import com.ruoyi.system.service.TBillService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.jsonwebtoken.lang.Assert;
import com.ruoyi.system.service.*;
import com.taxi591.bankapi.dto.ChargeBillRequest;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,6 +28,15 @@
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;

/**
 * <p>
@@ -36,6 +47,7 @@
 * @since 2025-01-17
 */
@Service
@Slf4j
public class TBillServiceImpl extends ServiceImpl<TBillMapper, TBill> implements TBillService {

    @Autowired
@@ -47,6 +59,20 @@
    @Autowired
    TBillDetailService tBillDetailService;

    @Autowired
    TFlowManagementService tFlowManagementService;

    @Autowired
    TBankFlowService tBankFlowService;

    @Autowired
    TBillConfirmService tBillConfirmService;

    @Autowired
    TPayOrderService tPayOrderService;

    @Autowired
    TOrderBillService orderBillService;

    public PageInfo<TBillDto> queryPage(TBillQuery query){
        PageInfo<TBill> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -68,14 +94,123 @@
        return pageInfo;
    }

    private static final String[] ignorePro = {"payableFeesMoney","payableFeesPenalty","payFeesMoney","outstandingMoney"};

    /**
     * 传的金额
     *
     * 更新类型  1.仅更新信息及状态 2.更新信息、金额及状态
     * 为1时，仅更新非金额之外的信息及状态
     * 为2时，传入的金额，是需要增加或减少的金额，非计算后的金额
     * 当账单状态为已缴费后，不做任何更新
     * @param tBill
     * @param type
     * @return
     */
    public Boolean lockAndUpdateInfo(TBill tBill){
    public TBill lockAndUpdateInfo(@NotNull TBill tBill, @NotNull Integer type){
        if (StringUtils.isEmpty(tBill.getId())){
            throw new ServiceException("账单主键ID不能为空");
        }
        String requestId = UUID.fastUUID().toString();
        String lockkey = CacheConstants.BILL_UPDATE_LOCK_KEY + tBill.getId();
        boolean isok = redisCache.trylockLoop(lockkey, requestId, 60);
        if (isok){
            try {
                TBill save = new TBill();
                TBill presist = getById(tBill.getId());
                //如果账单是已缴费状态，本方法不再进行更新账单
                if (presist.getPayFeesStatus().equals("3")){
                    throw new ServiceException("该账单已缴费完成");
                }
                switch (type){
                    // 仅更新除金额字段外的属性
                    case 1:
                    {
                        BeanUtils.copyProperties(tBill,save,ignorePro);
                    }
                    break;
                    // 计算并更新金额、存入违约金、已缴费金额会自动计算欠费，如计算出无欠费则会更新状态为已缴费
                    case 2:
                    {
                        BeanUtils.copyProperties(tBill,save);

                        // 处理应缴费 ，注意一般情况下不会修改该金额
                        if (tBill.getPayableFeesMoney()!=null){
                            presist.setPayableFeesMoney(presist.getPayableFeesMoney()!=null?presist.getPayableFeesMoney():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayableFeesMoney().add(tBill.getPayableFeesMoney());
                            save.setPayableFeesMoney(result);
                            //计算欠费 = 应缴费(新)+违约金-已缴费
                            BigDecimal outstand = save.getPayableFeesMoney()
                                    .add(presist.getPayableFeesPenalty())
                                    .subtract(presist.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                        }
                        //处理应缴违约金 ，不能和缴费金额一起传
                        if (tBill.getPayableFeesPenalty()!=null){
                            presist.setPayableFeesPenalty(presist.getPayableFeesPenalty()!=null?presist.getPayableFeesPenalty():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayableFeesPenalty().add(tBill.getPayableFeesPenalty());
                            save.setPayableFeesPenalty(result);
                            //计算欠费 = 应缴费+违约金（新）-已缴费
                            BigDecimal outstand = presist.getPayableFeesMoney()
                                    .add(save.getPayableFeesPenalty())
                                    .subtract(presist.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                        }
                        //处理缴费金额
                        if (tBill.getPayFeesMoney()!=null){
                            presist.setPayFeesMoney(presist.getPayFeesMoney()!=null?presist.getPayFeesMoney():BigDecimal.ZERO);
                            BigDecimal result = presist.getPayFeesMoney().add(tBill.getPayFeesMoney());
                            save.setPayFeesMoney(result);
                            //缴费后的欠费 =(应缴费+违约金)-已缴费金额
                            BigDecimal outstand = save.getPayableFeesMoney()
                                    .add(presist.getPayableFeesPenalty())
                                    .subtract(save.getPayFeesMoney());
                            save.setOutstandingMoney(outstand);
                            //抵扣金额就是缴费金额
                            save.setDeductionMoney(tBill.getPayableFeesMoney());
                            save.setPreOutstand(presist.getOutstandingMoney());
                            if (outstand.compareTo(BigDecimal.ZERO)<=0){
                                save.setPayFeesStatus("3");
                            }
                        }
                    }
                    break;

                }
                updateById(save);
                return save;
            }finally {
                redisCache.unlock(lockkey,requestId);
            }
        }
        return null;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean lockAndUpdateByAmountBatch(List<TBill> bills, BigDecimal amount, Consumer<TBill> consumer) {
        List<TBill> result = bills.stream().sorted(Comparator.comparing(TBill::getCreateTime))
                .collect(Collectors.toList());
        BigDecimal remain = amount;
        for (TBill bill : result) {
            //如果剩余金额小于账单欠费金额，则
            if (remain.compareTo(bill.getOutstandingMoney())<=0){
                TBill param = new TBill();
                param.setId(bill.getId());
                param.setPayFeesMoney(remain);
                TBill tBill = lockAndUpdateInfo(param, 2);
                if (consumer!=null){
                    consumer.accept(tBill);
                }
                break;
            }
            remain = remain.subtract(bill.getOutstandingMoney());
            TBill param = new TBill();
            param.setId(bill.getId());
            param.setPayFeesMoney(bill.getOutstandingMoney());
            TBill tBill = lockAndUpdateInfo(param, 2);
            if (consumer!=null){
                consumer.accept(tBill);
            }
        }
        return true;
    }
@@ -95,5 +230,101 @@
        }
    }

    @Override
    public boolean checkOfflinePay(OfflinePayCheckDto dto) {
        List<TBill> tBills = listByIds(dto.getBillIds());
        TBillConfirm confirm = tBillConfirmService.getById(dto.getConfirmId());
        lockAndUpdateByAmountBatch(tBills,dto.getAmount(),(bill)->{
            TFlowManagement save = new TFlowManagement();
            save.setPayType(3);
            save.setPayer(dto.getPayer());
            save.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
            save.setBankSerialNumber(dto.getBankSerilNum());
            save.setFlowType(2);
            save.setPaymentBillId(bill.getId());
            save.setDeductionMoney(bill.getDeductionMoney());
            save.setFlowMoney(dto.getAmount());
            save.setRemainingMoney(bill.getOutstandingMoney());
            save.setPreOutstand(bill.getPreOutstand());
            tFlowManagementService.save(save);
        });
        TBankFlow bankFlow = new TBankFlow();
        bankFlow.setPayType(3);
        bankFlow.setPayer(dto.getPayer());
        bankFlow.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
        bankFlow.setBankSerialNumber(dto.getBankSerilNum());
        bankFlow.setFlowMoney(dto.getAmount());
        bankFlow.setFlowStatus(1);
        tBankFlowService.save(bankFlow);
        return false;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void completePay(ChargeBillRequest billRequest) {
        String orderNo = billRequest.getMessage().getInfo().getInput1();
        String uuid = UUID.fastUUID().toString();
        boolean lock = redisCache.trylockLoop(CacheConstants.COMPLETE_PAY_LOCK_KEY + orderNo, uuid, 60);
        if (lock){
            TPayOrder order = tPayOrderService.getById(orderNo);
            if (order==null){
                throw new ServiceException("订单不存在");
            }
            if (StringUtils.isNotEmpty(order.getPayNo())){
                log.info("订单号已处理：{}",orderNo);
                return;
            }
            /**
             * 更新订单状态
             */
            TPayOrder save = new TPayOrder();
            save.setId(order.getId());
            save.setStatus(1);
            save.setPayNo(billRequest.getMessage().getInfo().getTraceNo());
            save.setPayType(billRequest.getMessage().getHead().getChannel());
            try {
                save.setPayTime(DateUtils.parseDate(billRequest.getMessage().getHead().getTimeStamp(),"yyyyMMddHHmmssSSS"));
            } catch (ParseException e) {
                throw new ServiceException("日期格式化错误");
            }
            save.setCallbackTime(new Date());
            BigDecimal payAmount = new BigDecimal(billRequest.getMessage().getInfo().getPayBillAmt());
            save.setActPayAmount(payAmount
                    .multiply(AmountConstant.b100).longValue());
            save.setStatus(1);
            save.setPayInfo(billRequest.getMessage().toString());
            tPayOrderService.updateById(save);
            /**
             * 更新账单状态
             */
            List<TOrderBill> orderBills = orderBillService.getByOrderNo(order.getId());
            List<TBill> bills = orderBills.stream().map(ob -> getById(ob.getBillId())).collect(Collectors.toList());
            lockAndUpdateByAmountBatch(bills,payAmount,(bill)->{
                TFlowManagement saveFlow = new TFlowManagement();
                saveFlow.setPayType(1);
                saveFlow.setPayer(order.getUserId());
                saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
                saveFlow.setBankSerialNumber(save.getPayNo());
                saveFlow.setFlowType(2);
                saveFlow.setPaymentBillId(bill.getId());
                saveFlow.setDeductionMoney(bill.getDeductionMoney());
                saveFlow.setFlowMoney(payAmount);
                saveFlow.setRemainingMoney(bill.getOutstandingMoney());
                saveFlow.setPreOutstand(bill.getPreOutstand());
                tFlowManagementService.save(saveFlow);
            });
            TBankFlow bankFlow = new TBankFlow();
            bankFlow.setPayType(1);
            bankFlow.setPayer(order.getUserId());
            bankFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
            bankFlow.setBankSerialNumber(save.getPayNo());
            bankFlow.setFlowMoney(payAmount);
            bankFlow.setFlowStatus(1);
            tBankFlowService.save(bankFlow);

        }

    }


}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java

@@ -118,6 +118,7 @@
        CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO();
        TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordMapper.selectOne(new LambdaQueryWrapper<TCheckAcceptRecord>()
                .eq(TCheckAcceptRecord::getContractId, id));
        if (tCheckAcceptRecord==null)return checkAcceptRecordVO;
        BeanUtils.copyProperties(tCheckAcceptRecord,checkAcceptRecordVO);
        THouse tHouse = houseMapper.selectById(tCheckAcceptRecord.getHouseId());
        tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFaultAreaDicServiceImpl.java

@@ -11,6 +11,7 @@
import com.ruoyi.system.query.TFaultAreaDicQuery;
import com.ruoyi.system.service.TFaultAreaDicService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TFaultAreaDicVO;
import com.ruoyi.system.vo.TenantVO;
import org.springframework.stereotype.Service;

@@ -45,4 +46,9 @@
            return this.count(Wrappers.lambdaQuery(TFaultAreaDic.class).eq(TFaultAreaDic::getFaultAreaName, dto.getFaultAreaName())) > 0;
        }
    }

    @Override
    public List<TFaultAreaDicVO> getAreaDicList() {
        return this.baseMapper.getAreaDicList();
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java

@@ -1,12 +1,15 @@
package com.ruoyi.system.service.impl;

import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.system.mapper.TInformationMapper;
import com.ruoyi.system.model.TInformation;
import com.ruoyi.system.query.TInformationQuery;
import com.ruoyi.system.service.TInformationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.HouseVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -22,10 +25,16 @@
@Service
public class TInformationServiceImpl extends ServiceImpl<TInformationMapper, TInformation> implements TInformationService {

    @Autowired
    private RedisCache redisCache;

    @Override
    public PageInfo<TInformation> pageList(TInformationQuery query) {
        PageInfo<TInformation> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TInformation> list = this.baseMapper.pageList(query,pageInfo);
        list.forEach(item -> {
            item.setViewCount(redisCache.getCacheObject(Constants.INFORMATION_VIEW + item.getId()));
        });
        pageInfo.setRecords(list);
        return pageInfo;
    }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TItemTypeServiceImpl.java

@@ -10,6 +10,7 @@
import com.ruoyi.system.query.TItemTypeQuery;
import com.ruoyi.system.service.TItemTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TItemTypeVO;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -43,4 +44,9 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<TItemTypeVO> getItemList() {
        return this.baseMapper.getItemList();
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderBillServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TOrderBillMapper;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.model.TOrderBill;
import com.ruoyi.system.service.TOrderBillService;
import org.springframework.stereotype.Service;

import javax.validation.constraints.NotEmpty;
import java.util.List;

/**
 * <p>
@@ -17,4 +23,9 @@
@Service
public class TOrderBillServiceImpl extends ServiceImpl<TOrderBillMapper, TOrderBill> implements TOrderBillService {

    @Override
    public List<TOrderBill> getByOrderNo(@NotEmpty String orderNo) {
        return list(new LambdaQueryWrapper<TOrderBill>().eq(TOrderBill::getOrderNo,orderNo));

    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/FaultConcatInfoVO.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TContract;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;

@Data
@ApiModel(value = "报修房源信息VO")
public class FaultConcatInfoVO extends TContract {

    @ApiModelProperty(value = "房屋名称")
    private String houseName;

}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TBillDetail;
import com.ruoyi.system.model.THouse;
@@ -9,6 +10,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

@Data
@@ -26,4 +28,18 @@

    @ApiModelProperty(value = "租金支付方式 月付 季付 年付")
    private String payType;

    @ApiModelProperty(value = "押金")
    private BigDecimal deposit;
    @ApiModelProperty(value = "甲方联系人")
    private String partyOnePerson;

    @ApiModelProperty(value = "甲方联系方式")
    private String partyOnePhone;
    @ApiModelProperty(value = "合同开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime concatStartTime;
    @ApiModelProperty(value = "合同结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime concatEndTime;
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TFaultAreaDicVO.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TFaultAreaDic;
import com.ruoyi.system.model.TFaultDescribeDic;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel(value = "故障区域vo")
public class TFaultAreaDicVO extends TFaultAreaDic {

    @ApiModelProperty(value = "故障描述")
    private List<TFaultDescribeDic> faultDescribeDicList;

}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TItemTypeVO.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TItem;
import com.ruoyi.system.model.TItemType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel(value = "物品类型VO")
public class TItemTypeVO extends TItemType {

    @ApiModelProperty(value = "维修物品集合")
    private List<TItem> itemList;

}

 ruoyi-system/src/main/resources/mapper/system/TContractMapper.xml

@@ -80,7 +80,7 @@
        select t1.*,t2.contract_number as contractNumber,t3.resident_name as residentName,t3.phone as phone
        from t_bill t1
        left join t_contract t2 on t1.contract_id = t2.id
        left join t_resident t3 on t2.tenant_id = t3.id
        left join t_tenant t3 on t2.tenant_id = t3.id
        where t2.id = #{query.id}
        and (t1.pay_fees_status = 1 or t1.pay_fees_status = 4)
        AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}

 ruoyi-system/src/main/resources/mapper/system/TFaultAreaDicMapper.xml

@@ -24,5 +24,11 @@
        WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>
    <select id="getAreaDicList" resultType="com.ruoyi.system.vo.TFaultAreaDicVO">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_fault_area_dic
        WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml

@@ -5,8 +5,9 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TFaultRepairMessage">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="tenant_id" property="tenantId" />
        <result column="item_id" property="itemId" />
        <result column="contract_id" property="contractId" />
        <result column="fault_area_name" property="faultAreaName" />
        <result column="describe_name" property="describeName" />
        <result column="describe_detail" property="describeDetail" />
@@ -18,7 +19,7 @@
        <result column="leave_message" property="leaveMessage" />
        <result column="handle_person" property="handlePerson" />
        <result column="handle_time" property="handleTime" />
        <result column="reault_describe" property="reaultDescribe" />
        <result column="result_describe" property="resultDescribe" />
        <result column="repair_picture" property="repairPicture" />
        <result column="attachment" property="attachment" />
        <result column="status" property="status" />
@@ -31,7 +32,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, item_id, fault_area_name, describe_name, describe_detail, fault_pictures, service_address, repair_type, visit_time, contact_number, leave_message, handle_person, handle_time, reault_describe, repair_picture, attachment, status, create_time, update_time, create_by, update_by, disabled
        id, tenant_id, item_id,contract_id, fault_area_name, describe_name, describe_detail, fault_pictures, service_address, repair_type, visit_time, contact_number, leave_message, handle_person, handle_time, result_describe, repair_picture, attachment, status, create_time, update_time, create_by, update_by, disabled
    </sql>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TItemTypeMapper.xml

@@ -25,5 +25,12 @@
        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>
    <select id="getItemList" resultType="com.ruoyi.system.vo.TItemTypeVO">
        select
        <include refid="Base_Column_List"/>
        from t_item_type
        where disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY sort_by,create_time DESC
    </select>

</mapper>