From e8aed266e061f136c625bf94d109a142e9229059 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 14:34:32 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 39 ++++-- .../controller/rent/WxAllBillController.java | 2 +- .../db/migration/V202408000000001.sql | 121 ++++++++++++++++++ .../com/iformall/domain/po/WxAllBill.java | 5 +- .../iformall/domain/po/WxFinanceFinish.java | 75 +++++++++++ .../enums/EnumFinanceFinishStatus.java | 38 ++++++ .../mapper/WxFinanceFinishMapper.java | 16 +++ .../iformall/service/WxFinanceService.java | 5 +- .../service/helper/WxBillAllHelper.java | 2 +- .../service/impl/WxFinanceServiceImpl.java | 14 +- .../main/resources/mapper/WxAllBillMapper.xml | 9 +- .../mapper/WxFinanceFinishMapper.xml | 62 +++++++++ 12 files changed, 366 insertions(+), 22 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumFinanceFinishStatus.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/WxFinanceFinishMapper.java create mode 100644 mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 88b4c50ea..b9ae9615f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -10,6 +10,7 @@ import com.iformall.domain.dto.FinanceSetOffDTO; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; +import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinancePrintData; import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; @@ -18,6 +19,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.enums.EnumBillAllType; +import com.iformall.enums.EnumFinanceFinishStatus; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; import com.iformall.enums.EnumYesOrNo; @@ -244,18 +246,6 @@ public class WxFinanceController extends BaseController { return new ResultData(list); } - @GetMapping("receiveSetoffStatus") - public ResultData receiveSetoffStatus() { - List list = new ArrayList(); - for (EnumFinanceReceiveStatus t : EnumFinanceReceiveStatus.getSetoff()) { - Map m = new HashMap(); - m.put("id", t.getCode()); - m.put("name", t.getMessage()); - list.add(m); - } - return new ResultData(list); - } - @GetMapping("receiveTypes") public ResultData receiveTypes() { List list = new ArrayList(); @@ -361,4 +351,29 @@ public class WxFinanceController extends BaseController { return new ResultData(this.getTenantInfo().getTenantId()); } + @GetMapping("finishStatus") + public ResultData receiveSetoffStatus() { + List list = new ArrayList(); + for (EnumFinanceFinishStatus t : EnumFinanceFinishStatus.values()) { + Map m = new HashMap(); + m.put("id", t.getCode()); + m.put("name", t.getMessage()); + list.add(m); + } + return new ResultData(list); + } + + @ApiOperation("过账列表") + @GetMapping("finishList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + }) + public ResultData finishList(@ModelAttribute WxFinanceFinish record, Integer pageNum, Integer pageSize) { + record.updateTenantInfo(getTenantInfo()); + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + PageInfo page = wxFinanceService.finishListAsPage(record, pageNum, pageSize); + return new ResultData(page); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 2c2875fb6..ce74c66c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -617,7 +617,7 @@ public class WxAllBillController extends BillBaseController { return new ResultData(Result.ERROR,"请选择商户"); } wxMerchant.updateTenantInfo(getTenantInfo()); - wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); + wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList(); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index a76ff86f5..532e7d39b 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -774,5 +774,126 @@ alter table wx_finance_receive_97 add column rent_shop_type int(1) not null alter table wx_finance_receive_98 add column rent_shop_type int(1) not null comment '店铺多经'; alter table wx_finance_receive_99 add column rent_shop_type int(1) not null comment '店铺多经'; +ALTER TABLE wx_all_bill_0 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_1 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_2 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_3 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_4 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_5 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_6 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_7 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_8 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_9 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_10 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_11 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_12 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_13 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_14 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_15 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_16 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_17 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_18 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_19 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_20 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_21 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_22 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_23 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_24 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_25 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_26 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_27 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_28 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_29 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_30 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_31 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_32 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_33 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_34 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_35 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_36 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_37 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_38 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_39 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_40 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_41 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_42 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_43 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_44 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_45 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_46 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_47 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_48 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_49 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_50 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_51 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_52 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_53 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_54 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_55 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_56 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_57 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_58 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_59 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_60 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_61 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_62 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_63 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_64 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_65 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_66 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_67 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_68 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_69 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_70 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_71 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_72 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_73 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_74 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_75 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_76 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_77 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_78 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_79 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_80 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_81 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_82 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_83 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_84 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_85 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_86 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_87 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_88 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_89 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_90 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_91 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_92 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_93 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_94 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_95 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_96 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_97 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_98 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; +ALTER TABLE wx_all_bill_99 ADD COLUMN finish_id BIGINT(20) COMMENT '结账id'; + + +CREATE TABLE `wx_finance_finish` ( + `id` bigint(20) NOT NULL COMMENT '主键ID', + `tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', + `parent_tenant_id` varchar(5) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID', + `create_time` timestamp NULL DEFAULT NULL, + `update_time` timestamp NULL DEFAULT NULL, + `create_by` bigint(20) DEFAULT NULL COMMENT '创建人', + `create_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人名称', + `update_by` bigint(20) DEFAULT NULL COMMENT '更新人', + `update_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人名称', + `status` int(3) NOT NULL COMMENT '状态', + `remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注', + `back_remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '反审核备注', + `start_date` timestamp NULL DEFAULT NULL COMMENT '开始日期', + `end_date` timestamp NULL DEFAULT NULL COMMENT '结束日期', + `name` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支付给商户金额', + PRIMARY KEY (`id`), + UNIQUE KEY `id_UNIQUE` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java index a6dfcab95..ba5c6110a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -200,6 +200,8 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "能源抄表ID", name = "energyReadingId") private Long energyReadingId; + @io.swagger.annotations.ApiModelProperty(value = "结账ID", name = "finishId") + private Long finishId; @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") @TableField(exist = false) @@ -303,6 +305,7 @@ public class WxAllBill extends TenantEntity { private Integer limitEnd; @TableField(exist = false) private Long feesStandarsId; - + @TableField(exist = false) + public Integer toPayMerchant; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java new file mode 100644 index 000000000..8fe433928 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java @@ -0,0 +1,75 @@ +package com.iformall.domain.po; + +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumFinanceCashierType; +import com.iformall.enums.EnumFinanceReceiveStatus; +import com.iformall.enums.EnumFinanceReceiveType; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +/** + */ +@TableName(value = "wx_finance_finish") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxFinanceFinish extends TenantEntity { + + private static final long serialVersionUID = 7009117540201976664L; + + @io.swagger.annotations.ApiModelProperty(value="id",name="id") + private Long id; + + @io.swagger.annotations.ApiModelProperty(value="createTime",name="createTime") + private Date createTime; + @TableField(exist = false) + private Date createTimeBegin; + @TableField(exist = false) + private Date createTimeEnd; + + @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") + private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value="createBy",name="createBy") + private Long createBy; + @io.swagger.annotations.ApiModelProperty(value="createByName",name="createByName") + private String createByName; + @io.swagger.annotations.ApiModelProperty(value="updateBy",name="updateBy") + private Long updateBy; + @io.swagger.annotations.ApiModelProperty(value="updateByName",name="updateByName") + private String updateByName; + + @io.swagger.annotations.ApiModelProperty(value = "状态EnumFinanceFinishStatus", name = "status") + private Integer status; + @TableField(exist = false) + private String statusName; + public String getStatusName() { + if (null != status) { + return EnumFinanceReceiveStatus.getEnum(status).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark") + private String remark; + + @io.swagger.annotations.ApiModelProperty(value = "remark", name = "remark") + private String backRemark; + + @io.swagger.annotations.ApiModelProperty(value = "startDate", name = "startDate") + private Date startDate; + + @io.swagger.annotations.ApiModelProperty(value = "endDate", name = "endDate") + private Date endDate; + + @io.swagger.annotations.ApiModelProperty(value = "name", name = "name") + private String name; +} diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumFinanceFinishStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceFinishStatus.java new file mode 100644 index 000000000..3b110f898 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumFinanceFinishStatus.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + */ + +public enum EnumFinanceFinishStatus { + + READY(1,"待审核结账"), + COMPLETE(2,"已审核结账"), + REREADY(3, "重新结账中") + ; + + public static EnumFinanceFinishStatus getEnum(Integer code) { + for (EnumFinanceFinishStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumFinanceFinishStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceFinishMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceFinishMapper.java new file mode 100644 index 000000000..033f8e82c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceFinishMapper.java @@ -0,0 +1,16 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxFinanceFinish; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + */ +public interface WxFinanceFinishMapper extends CommonMapper { + + List findList(WxFinanceFinish wxBillRent); + + WxFinanceFinish selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 285551ee2..060eda2c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -7,10 +7,10 @@ import com.iformall.domain.dto.FinanceSetOffDTO; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; +import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinancePrintData; import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; -import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.FinanceBillSetoffSum; @@ -46,4 +46,7 @@ public interface WxFinanceService { List printDataList(WxFinancePrintData record); List printTemplateList(WxFinancePrintTemplate record); WxFinancePrintTemplate getTemplateById(Long id); + + //结账 + PageInfo finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index 223328678..0dad960a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -99,6 +99,7 @@ public class WxBillAllHelper { if (null != wxMerchant.getNeedPayPreDays()) { bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); } + bill.setToPayMerchant(wxMerchant.getToPayMerchant()); } public WxBillSum getBillSum(WxMerchant wxMerchant,Date starttime, Date enttime) { @@ -216,7 +217,6 @@ public class WxBillAllHelper { } public List getMerchantBillList(WxMerchant wxMerchant) { - WxAllBill wxBillRent = new WxAllBill(); updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); wxBillRent.setSortColumns("starttime asc"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 8fdd0c8d5..97132b2ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -15,6 +15,7 @@ import com.iformall.domain.po.WxAllBill; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxEnergyFeesSetoff; +import com.iformall.domain.po.WxFinanceFinish; import com.iformall.domain.po.WxFinancePrintData; import com.iformall.domain.po.WxFinancePrintTemplate; import com.iformall.domain.po.WxFinanceReceive; @@ -37,6 +38,7 @@ import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillPayWayMapper; import com.iformall.mapper.WxEnergyFeesSetoffMapper; +import com.iformall.mapper.WxFinanceFinishMapper; import com.iformall.mapper.WxFinancePrintDataMapper; import com.iformall.mapper.WxFinancePrintTemplateMapper; import com.iformall.mapper.WxFinanceReceiveBillMapper; @@ -89,7 +91,9 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxFinancePrintDataMapper wxFinancePrintDataMapper; @Autowired WxFinancePrintTemplateMapper wxFinancePrintTemplateMapper; - + @Autowired + WxFinanceFinishMapper wxFinanceFinishMapper; + @Lazy @Autowired WxEnergyService wxEnergyService; @@ -1009,9 +1013,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { return wxFinancePrintTemplateMapper.selectById(id); } - - - + @Override + public PageInfo finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize) { + PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceFinishMapper.findList(record)); + return page; + } } diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index f9da5f1c8..efefb74d4 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -41,6 +41,7 @@ + @@ -48,7 +49,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`rent_shop_type`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`, `price_detail`,`need_pay`,`receive_pay`,`pay`,`bill_type`,`pay_way`,`pay_date`,`set_off`,`starttime`,`endtime`,`status`,`energy_fees_id`,`return_pay`, `bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`shop_id`,`shop_number`, - `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id` + `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id`,`finish_id` @@ -81,6 +82,9 @@ and (`starttime` <= #{needPayStartDay} and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7)) + + and (and `receive_pay` - `pay` - IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') < 0 or status in (8,9)) + and (`last_owe_call_time` is not null and `receive_pay` - `pay`- IFNULL(`set_off`,'0') + IFNULL(`return_pay`,'0') > 0 and status not in (3,6,7) ) and `merchant_id` is not null and `parent_bill_id` is not null @@ -89,6 +93,7 @@ and `energy_fees_id` is null and `energy_reading_calcuteId` = #{energyReadingCalcuteId} and `energy_reading_id` = #{energyReadingId} + and `finish_id` = #{finishId} and `rent_contract_id` in @@ -254,7 +259,7 @@ #{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark}, #{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay}, #{item.shopId},#{item.shopNumber},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.propertyContractId}, - #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId} + #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId},#{item.finishId} ) diff --git a/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml new file mode 100644 index 000000000..df1510595 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxFinanceFinishMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`,`update_by`,`update_by_name`, + `status`,`remark`,`back_remark`,`start_date`,`end_date`,`name` + + + + where 1=1 + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and `status` = #{status} + + and `name` like concat('%', #{name},'%') + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + +