From f2b882fdcce41b91598922db87cb0c29fbd1aa9e Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 5 Aug 2024 14:53:41 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 1 + .../market/WxFinanceController.java | 24 ----- .../market/WxFinancePrintController.java | 76 +++++++++++++ .../db/migration/V202408000000001.sql | 102 ------------------ .../com/iformall/domain/po/WxAllBill.java | 4 - .../service/WxFinancePrintService.java | 14 +++ .../iformall/service/WxFinanceService.java | 7 -- .../impl/WxFinancePrintServiceImpl.java | 42 ++++++++ .../service/impl/WxFinanceServiceImpl.java | 15 --- .../main/resources/mapper/WxAllBillMapper.xml | 8 +- 10 files changed, 136 insertions(+), 157 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java create mode 100644 mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index b031c8ce9..3463ea458 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -112,6 +112,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/user/updatepwd", "anon"); filterChainDefinitionMap.put("/carCallback/**", "anon"); filterChainDefinitionMap.put("/wxMallApply/sendvalidationcode", "anon"); + filterChainDefinitionMap.put("/print/**", "anon"); // 补发消息 filterChainDefinitionMap.put("/wxCoupon/updateStokeAndValidDate", "anon"); 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 b9ae9615f..467c3d049 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -320,30 +320,6 @@ public class WxFinanceController extends BaseController { return new ResultData(); } - @ApiOperation("打印项列表") - @GetMapping("printDatas") - @TenantIgnore - public ResultData printDatas(@ModelAttribute WxFinancePrintData record) { - record.setSortColumns("sort asc"); - return new ResultData(wxFinanceService.printDataList(record)); - } - - @ApiOperation("打印项列表") - @GetMapping("printTemplates") - @TenantIgnore - public ResultData printTemplates(@ModelAttribute WxFinancePrintTemplate record) { - record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - return new ResultData(wxFinanceService.printTemplateList(record)); - } - - @ApiOperation("打印项列表") - @GetMapping("templateDetail") - @TenantIgnore - public ResultData templateDetail(@ModelAttribute WxFinancePrintTemplate record) { - record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - return new ResultData(wxFinanceService.getTemplateById(record.getId())); - } - @ApiOperation("打印项项目需要获取的租户号") @GetMapping("templateCurrentTenant") @TenantIgnore diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java new file mode 100644 index 000000000..908183b9a --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinancePrintController.java @@ -0,0 +1,76 @@ +package com.iformall.controller.market; + +import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.TenantIgnore; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +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; +import com.iformall.domain.po.WxFinanceReceiveSetoff; +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; +import com.iformall.service.WxEnergyService; +import com.iformall.service.WxFinancePrintService; +import com.iformall.service.WxFinanceService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +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; + +@RestController +@RequestMapping("print") +public class WxFinancePrintController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxFinancePrintService wxFinancePrintService; + + @ApiOperation("打印项列表") + @GetMapping("printDatas") + @TenantIgnore + public ResultData printDatas(@ModelAttribute WxFinancePrintData record) { + record.setSortColumns("sort asc"); + return new ResultData(wxFinancePrintService.printDataList(record)); + } + + @ApiOperation("打印项列表") + @GetMapping("printTemplates") + @TenantIgnore + public ResultData printTemplates(@ModelAttribute WxFinancePrintTemplate record) { + record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + return new ResultData(wxFinancePrintService.printTemplateList(record)); + } + + + +} diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql index 532e7d39b..ebc26a5e6 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000001.sql @@ -774,108 +774,6 @@ 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', 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 ba5c6110a..403e2cb34 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -200,9 +200,6 @@ 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) public Long building; @@ -307,5 +304,4 @@ public class WxAllBill extends TenantEntity { private Long feesStandarsId; @TableField(exist = false) public Integer toPayMerchant; - } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java new file mode 100644 index 000000000..ffa836864 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxFinancePrintService.java @@ -0,0 +1,14 @@ +package com.iformall.service; + +import java.util.List; +import com.iformall.domain.po.WxFinancePrintData; +import com.iformall.domain.po.WxFinancePrintTemplate; +/** + */ +public interface WxFinancePrintService { + //打印 + List printDataList(WxFinancePrintData record); + List printTemplateList(WxFinancePrintTemplate record); + WxFinancePrintTemplate getTemplateById(Long id); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 060eda2c8..60c5c2c40 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -8,8 +8,6 @@ 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.WxFinanceReceiveSetoff; import com.iformall.domain.po.base.TenantEntity; @@ -42,11 +40,6 @@ public interface WxFinanceService { void createAdvance(WxFinanceReceive record,MallUserInfo user); PageInfo receiveSetoffListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); - //打印 - 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/impl/WxFinancePrintServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java new file mode 100644 index 000000000..b5b8c99b1 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java @@ -0,0 +1,42 @@ +package com.iformall.service.impl; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.iformall.domain.po.WxFinancePrintData; +import com.iformall.domain.po.WxFinancePrintTemplate; +import com.iformall.mapper.WxFinancePrintDataMapper; +import com.iformall.mapper.WxFinancePrintTemplateMapper; +import com.iformall.service.WxFinancePrintService; +import java.util.List; + +/** + */ +@Service +public class WxFinancePrintServiceImpl implements WxFinancePrintService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxFinancePrintDataMapper wxFinancePrintDataMapper; + @Autowired + WxFinancePrintTemplateMapper wxFinancePrintTemplateMapper; + + @Override + public List printDataList(WxFinancePrintData record) { + return wxFinancePrintDataMapper.findList(record); + } + + @Override + public List printTemplateList(WxFinancePrintTemplate record) { + return wxFinancePrintTemplateMapper.findList(record); + } + + @Override + public WxFinancePrintTemplate getTemplateById(Long id) { + return wxFinancePrintTemplateMapper.selectById(id); + } + + +} 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 97132b2ea..46fdc3002 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -998,21 +998,6 @@ public class WxFinanceServiceImpl implements WxFinanceService { return page; } - @Override - public List printDataList(WxFinancePrintData record) { - return wxFinancePrintDataMapper.findList(record); - } - - @Override - public List printTemplateList(WxFinancePrintTemplate record) { - return wxFinancePrintTemplateMapper.findList(record); - } - - @Override - public WxFinancePrintTemplate getTemplateById(Long id) { - return wxFinancePrintTemplateMapper.selectById(id); - } - @Override public PageInfo finishListAsPage(WxFinanceFinish record, Integer pageIndex, Integer pageSize) { PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceFinishMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml index efefb74d4..7819fc89e 100644 --- a/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAllBillMapper.xml @@ -41,7 +41,6 @@ - @@ -49,7 +48,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`,`finish_id` + `is_preview`,`shop_info`,`rent_contract_id`,`property_contract_id`,`parent_bill_id`,`energy_reading_calcuteId`,`energy_reading_id` @@ -83,7 +82,7 @@ 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 ( `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 @@ -93,7 +92,6 @@ 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 @@ -259,7 +257,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.finishId} + #{item.parentBillId},#{item.energyReadingCalcuteId},#{item.energyReadingId} )