无关风月
2024-09-10 18cd4250afb0e64e6f989a3cc072e76dd6c2abf9
代码提交
2个文件已修改
6 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingBill.java
@@ -56,8 +56,8 @@
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "1日结2月结")
    @TableField("timeType")
    private Integer timeType;
    @TableField("orderState")
    private Integer orderState;
    @ApiModelProperty(value = "账户类型 1微信商户 2支付宝商户")
    @TableField("payType")
    private Integer payType;
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -176,7 +176,7 @@
        for (ChargingBillListVO orderInvoiceVO : list) {
            TChargingBillExport tChargingBillExport = new TChargingBillExport();
            tChargingBillExport.setCode(orderInvoiceVO.getCode());
            switch (orderInvoiceVO.getTimeType()){
            switch (orderInvoiceVO.getOrderState()){
                case 1:
                    tChargingBillExport.setBillType("日账单");
                    break;