From abd89d38091007eacf47d1418a83fe9366caa61b Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 26 Aug 2024 21:50:04 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 10 +- .../db/migration/V202408000000005.sql | 61 +++----- .../com/iformall/domain/po/WxAllBill.java | 2 +- .../domain/po/WxEnergyReadingCalcute.java | 14 +- .../po/WxEnergyReadingCalcuteResult.java | 44 +++++- .../java/com/iformall/domain/po/WxShop.java | 2 +- .../com/iformall/service/WxEnergyService.java | 2 +- .../service/helper/WxEnergyHelper.java | 2 +- .../service/impl/WxEnergyServiceImpl.java | 137 +++++++++--------- .../mapper/WxEnergyReadingCalcuteMapper.xml | 4 +- .../WxEnergyReadingCalcuteResultMapper.xml | 7 +- 11 files changed, 144 insertions(+), 141 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 893bb3aa8..e15e65ffe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -206,6 +206,7 @@ public class WxEnergyController extends BaseController { WxEnergyMeter meter = list.get(i); WxShop s = new WxShop(); s.setId(meter.getId()); + s.setTreeType(meter.getTreeType()); s.setShopNumber(meter.getName()); s.setTreeParentId(record.getFloor()); s.setTreeParentType("floor"); @@ -280,7 +281,7 @@ public class WxEnergyController extends BaseController { } return new ResultData(list); } - return new ResultData(); + return new ResultData(new ArrayList()); } @ApiOperation("用户能源表新增修改") @@ -663,10 +664,9 @@ public class WxEnergyController extends BaseController { @ApiOperation("生成账单") @PostMapping("createBill") public ResultData createBill(@RequestBody WxEnergyReadingCalcute record) { -// record.updateTenantInfo(getTenantInfo()); -// Integer number = wxEnergyService.calcuteReading(wrc, getUser()); -// return new ResultData(number); - return null; + record.updateTenantInfo(getTenantInfo()); + wxEnergyService.createBill(record, getUser()); + return new ResultData(); } @PostMapping("calcuteIsDel") diff --git a/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql b/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql index ca1257354..66fe4b937 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202408000000005.sql @@ -675,42 +675,6 @@ CREATE TABLE `wx_energy_fees_time_shop` ( KEY `T_P_S` (`tenant_id`,`shop_id`,`period`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表'; -CREATE TABLE `wx_energy_reading_calcute_shop` ( - `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, - `calcute_id` bigint(20) NOT NULL COMMENT '费用计算ID', - `shop_id` bigint(20) NOT NULL COMMENT '店铺ID', - PRIMARY KEY (`id`), - UNIQUE KEY `id_UNIQUE` (`id`), - UNIQUE KEY `T_T_F` (`tenant_id`,`calcute_id`,`shop_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表'; - -drop TABLE wx_energy_reading_calcute; -CREATE TABLE `wx_energy_reading_calcute` ( - `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, - `create_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `update_by` bigint(20) DEFAULT NULL, - `update_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `period` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属年月', - `fees_id` bigint(20) NOT NULL COMMENT '科目ID', - `is_calcuted` int(1) NOT NULL DEFAULT '0' COMMENT '是否已计算过', - `calcute_success` int(1) DEFAULT '0' COMMENT '计算是否成功', - `is_del` int(1) NOT NULL DEFAULT '0' COMMENT '是否已删除', - `shop_size` int(6) NOT NULL DEFAULT '0' COMMENT '店铺数量', - PRIMARY KEY (`id`), - UNIQUE KEY `id_UNIQUE` (`id`), - UNIQUE KEY `T_P_F` (`tenant_id`,`period`,`fees_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表'; - alter table wx_energy_meter_reading_0 add column building_name varchar(100) comment '所属楼栋,有可能会是多个'; alter table wx_energy_meter_reading_1 add column building_name varchar(100) comment '所属楼栋,有可能会是多个'; @@ -1320,6 +1284,29 @@ alter table wx_energy_fees_97 add column is_public int(1) not null default alter table wx_energy_fees_98 add column is_public int(1) not null default 0 comment '是否公摊'; alter table wx_energy_fees_99 add column is_public int(1) not null default 0 comment '是否公摊'; +drop TABLE wx_energy_reading_calcute; +CREATE TABLE `wx_energy_reading_calcute` ( + `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, + `create_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `update_by` bigint(20) DEFAULT NULL, + `update_by_name` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `period` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属年月', + `fees_id` bigint(20) NOT NULL COMMENT '科目ID', + `is_calcuted` int(1) NOT NULL DEFAULT '0' COMMENT '是否已计算过', + `is_del` int(1) NOT NULL DEFAULT '0' COMMENT '是否已删除', + `shop_size` int(6) NOT NULL DEFAULT '0' COMMENT '店铺数量', + `shop` text COLLATE utf8mb4_unicode_ci COMMENT '店铺编号', + PRIMARY KEY (`id`), + UNIQUE KEY `id_UNIQUE` (`id`), + UNIQUE KEY `T_P_F` (`tenant_id`,`period`,`fees_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='能耗表抄表'; + CREATE TABLE `wx_energy_reading_calcute_result` ( `id` bigint(20) NOT NULL COMMENT '主键ID', @@ -1331,9 +1318,9 @@ CREATE TABLE `wx_energy_reading_calcute_result` ( `shop_id` bigint(20) NOT NULL COMMENT '店铺ID', `fees_id` bigint(20) NOT NULL COMMENT '科目编号', `fees_shop_id` bigint(20) NOT NULL COMMENT '店铺科目编号', - `meter_id` bigint(20) DEFAULT NULL COMMENT '表编号', `money` varchar(30) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '金额', `period` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '所属年月', + `money_deail` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '详细说明', PRIMARY KEY (`id`), UNIQUE KEY `id_UNIQUE` (`id`), UNIQUE KEY `T_T_F` (`tenant_id`,`calcute_id`,`shop_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 7644c5cd7..147446db9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java @@ -260,7 +260,7 @@ public class WxAllBill extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "能源抄表计算ID", name = "energyReadingCalcuteId") private Long energyReadingCalcuteId; - @io.swagger.annotations.ApiModelProperty(value = "能源抄表ID", name = "energyReadingId") + @io.swagger.annotations.ApiModelProperty(value = "WxEnergyReadingCalcuteResult的id", name = "energyReadingId") private Long energyReadingId; @io.swagger.annotations.ApiModelProperty(value = "账单额外生成来源EnumBillExtraCreateFrom", name = "extraCreateFrom") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java index cd564fb75..8d9b84458 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcute.java @@ -59,21 +59,9 @@ public class WxEnergyReadingCalcute extends TenantEntity { @TableField(exist = false) private String feesPhysicsTypeName; - @io.swagger.annotations.ApiModelProperty(value = "isCalcuted", name = "isCalcuted") + @io.swagger.annotations.ApiModelProperty(value = "是否已生成账单", name = "isCalcuted") private Integer isCalcuted; - @io.swagger.annotations.ApiModelProperty(value = "importSuccess", name = "importSuccess") - private Integer calcuteSuccess; - @TableField(exist = false) - private String calcuteSuccessName; - private String getCalcuteSuccessName() { - if (null != calcuteSuccess && calcuteSuccess.intValue() == EnumYesOrNo.YES.getCode().intValue()) { - return "成功"; - }else { - return "未完成计算"; - } - } - @io.swagger.annotations.ApiModelProperty(value = "是否删除", name = "isDel") private Integer isDel; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java index 99e7c0eef..1f7929e1e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxEnergyReadingCalcuteResult.java @@ -2,7 +2,9 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.common.IdWorker; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumYesOrNo; import com.iformall.utils.DateUtils; @@ -65,17 +67,47 @@ public class WxEnergyReadingCalcuteResult extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="费用标准ID",name="feesCalcuteId") private Long feesShopId; - @io.swagger.annotations.ApiModelProperty(value="表ID",name="meterId") - private Long meterId; - @Excel(name = "表号", width = 20, orderNum = "7") - @TableField(exist = false) - private String meterName; - @Excel(name = "金额", width = 20, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value="金额",name="money") private String money; + @Excel(name = "详细说明", width = 20, orderNum = "8") + @io.swagger.annotations.ApiModelProperty(value="详细说明",name="moneyDeail") + private String moneyDeail; + @TableField(exist = false) private List shopIds; + public WxAllBill generateBill(WxEnergyReadingCalcute calcute,WxMerchant merchant,WxShop shop,MallUserInfo user,String needPay,String detail,String remark) { + WxAllBill daily = new WxAllBill(); + final IdWorker idWorker = IdWorker.get(); + daily.setId(idWorker.nextId()); + daily.updateTenantInfo(this); + daily.setMerchantId(merchant.getId()); + daily.setRentShopType(merchant.getType()); + daily.setCreatetime(new Date()); + daily.setCreateBy(user.getId()); + daily.setCreateByName(user.getName()); + daily.setUpdateBy(user.getId()); + daily.setUpdateByName(user.getName()); + daily.setUpdatetime(new Date()); + daily.setReceivePay(needPay); + daily.setNeedPay(needPay); + daily.setPay("0"); + daily.setStarttime(DateUtils.getDayBegin(new Date())); + daily.setEndtime(DateUtils.getDayEnd(new Date())); + daily.setOwe(needPay); + daily.setShopId(this.shopId); + daily.setShopNumber(shop.getShopNumber()); + daily.setBillType(EnumBillAllType.DAILY.getCode()); + daily.setEnergyFeesId(calcute.getFeesId()); + daily.setPriceDetail(detail); + daily.setServiceChargePay("0"); + daily.setBillRemark(remark); + daily.setIsPreview(EnumYesOrNo.NO.getCode()); + daily.setEnergyReadingCalcuteId(calcute.getId()); + daily.setEnergyReadingId(id); + return daily; + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index f7e5d2832..32b4d5149 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -116,7 +116,7 @@ public class WxShop extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="管理人电话",name="managerPhone") private String managerPhone; - @io.swagger.annotations.ApiModelProperty(value = "类型", name = "type") + @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") private Integer type; diff --git a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index 5b713441f..8e13de70a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -80,7 +80,7 @@ public interface WxEnergyService { void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); PageInfo readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize); void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record,HttpServletRequest request, HttpServletResponse response); - Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); + void createBill(WxEnergyReadingCalcute record, MallUserInfo user); void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); List getReadingCalcuteShopNumber(WxEnergyReadingCalcute record); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java index 57cdc2574..5f31fcde4 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java @@ -45,7 +45,7 @@ public class WxEnergyHelper { return m; } - public static String calcuteMoney(WxEnergyFeesTime time,WxEnergyMeter meter,WxEnergyFeesShop shopfee) { + public static String calcuteMoney(StringBuffer sb,WxEnergyFeesTime time,List meterList,WxEnergyFeesShop shopfee) { return "0"; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index b9de82944..fe9a7df2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -943,22 +943,23 @@ public class WxEnergyServiceImpl implements WxEnergyService { //循环店铺科目, for (int j = 0 ; j < shopFeesList.size() ; j ++) { WxEnergyFeesShop shopfee = shopFeesList.get(j); + WxEnergyReadingCalcuteResult cs = new WxEnergyReadingCalcuteResult(); + cs.updateTenantInfo(record); + cs.setId(idWorker.nextId()); + cs.setCalcuteId(record.getId()); + cs.setShopId(shopId); + cs.setCreateTime(new Date()); + cs.setUpdateTime(new Date()); + cs.setFeesId(shopfee.getFeesId()); + cs.setFeesShopId(shopfee.getId()); + StringBuffer sb = new StringBuffer(); + cs.setMoney(WxEnergyHelper.calcuteMoney(sb,time, meterList, shopfee)); + cs.setPeriod(record.getPeriod()); + cs.setMoney(sb.toString()); + resultList.add(cs); //查询每一个表的抄表数据,求和 for (int k = 0 ; k < meterList.size() ; k++) { - WxEnergyReadingCalcuteResult cs = new WxEnergyReadingCalcuteResult(); - cs.updateTenantInfo(record); - cs.setId(idWorker.nextId()); - cs.setCalcuteId(record.getId()); - cs.setShopId(shopId); - cs.setCreateTime(new Date()); - cs.setUpdateTime(new Date()); - cs.setFeesId(shopfee.getFeesId()); - cs.setFeesShopId(shopfee.getId()); - WxEnergyMeter meter = meterList.get(k); - cs.setMeterId(meter.getId()); - cs.setMoney(WxEnergyHelper.calcuteMoney(time, meter, shopfee)); - cs.setPeriod(record.getPeriod()); - resultList.add(cs); + } } } @@ -977,7 +978,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { Map fessMap = this.getFeesMap(fq); Map floorMap = wxMallFloorService.getFloorMap(record); Map buildingMap = wxMallBuildingService.getBuildingMap(record); - List meterIdList = new ArrayList(); List shopIdList = new ArrayList(); for (int i = 0 ; i < page.getList().size(); i++) { WxEnergyReadingCalcuteResult c = page.getList().get(i); @@ -987,19 +987,8 @@ public class WxEnergyServiceImpl implements WxEnergyService { c.setFeesName(fees.getName()); } } - if (null != c.getMeterId()) { - meterIdList.add(c.getMeterId()); - } shopIdList.add(c.getShopId()); } - Map meterMap = null; - if (meterIdList.size() > 0 ) { - WxEnergyMeter mq = new WxEnergyMeter(); - mq.updateTenantInfo(record); - mq.setIds(meterIdList); - meterMap = this.getMeterMap(mq); - } - Map shopMap = null; if (shopIdList.size() > 0 ) { WxShop sq = new WxShop(); @@ -1009,12 +998,6 @@ public class WxEnergyServiceImpl implements WxEnergyService { } for (int i = 0 ; i < page.getList().size(); i++) { WxEnergyReadingCalcuteResult c = page.getList().get(i); - if (null != meterMap && null != c.getMeterId()) { - WxEnergyMeter m = meterMap.get(c.getMeterId()); - if (null != m) { - c.setMeterName(m.getName()); - } - } if (null != shopMap && null != c.getShopId()) { WxShop s = shopMap.get(c.getShopId()); if (null != s) { @@ -1129,45 +1112,61 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override - public Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user) { + public void createBill(WxEnergyReadingCalcute record, MallUserInfo user) { + + WxEnergyReadingCalcute calcute = wxEnergyReadingCalcuteMapper.selectById(record.getId(), record.getTenantId()); + + WxEnergyReadingCalcuteResult crq = new WxEnergyReadingCalcuteResult(); + crq.updateTenantInfo(record); + crq.setCalcuteId(calcute.getId()); + List shopIdList = wxEnergyReadingCalcuteResultMapper.findShopIdList(crq); + Map shopMap = null; + Map merchantMap = null; + if (shopIdList.size() > 0 ) { + WxShop sq = new WxShop(); + sq.updateTenantInfo(record); + sq.setIds(shopIdList); + shopMap = wxShopService.findShopMap(sq); + merchantMap = wxMerchantService.getShopMerchantMap(sq); + } -// //用户表列表 -// List readingList = wxEnergyMeterReadingMapper.findList(reading); -// if (null != readingList && readingList.size() > 0 ) { -// -// -// boolean allSuccess = true; -// if (billList.size() > 0 ) { -// try { -// //先把之前的未付的账单全部删除掉,已支付的账单先不处理 -// WxAllBill delDaily = new WxAllBill(); -// delDaily.updateTenantInfo(record); -// delDaily.setEnergyReadingCalcuteId(record.getId()); -// wxAllBillService.deleteEnergyReadingBills(delDaily); -// wxAllBillService.insertBills(record.getTenantId(), billList); -// }catch(Exception e) { -// logger.error("insert bills error.",e); -// allSuccess = false; -// } -// WxEnergyReadingCalcute c = new WxEnergyReadingCalcute(); -// c.updateTenantInfo(record); -// c.setId(record.getId()); -// c.setIsCalcuted(EnumYesOrNo.YES.getCode()); -// c.setUpdateTime(new Date()); -// c.setUpdateBy(user.getId()); -// c.setUpdateByName(user.getName()); -// c.setRemark(record.getRemark()); -// if (allSuccess) { -// c.setCalcuteSuccess(EnumYesOrNo.YES.getCode()); -// }else { -// c.setCalcuteSuccess(EnumYesOrNo.NO.getCode()); -// } -// wxEnergyReadingCalcuteMapper.updateById(c); -// return billList.size(); -// } -// } - return 0; + List resultList = wxEnergyReadingCalcuteResultMapper.findList(crq); + if (null != resultList && resultList.size() > 0 ) { + List billList = new ArrayList(); + for (int i = 0 ; i < resultList.size(); i++) { + WxEnergyReadingCalcuteResult result = resultList.get(i); + WxShop shop = null; + if (null != shopMap) { + shop = shopMap.get(result.getShopId()); + } + WxMerchant merchant = null; + if (null != merchantMap) { + merchant = merchantMap.get(result.getShopId()); + } + WxAllBill bill = result.generateBill(calcute, merchant, shop, user, result.getMoney(), result.getMoneyDeail(), "能源计算自动生成"); + billList.add(bill); + } + try { + //先把之前的未付的账单全部删除掉,已支付的账单先不处理 + WxAllBill delDaily = new WxAllBill(); + delDaily.updateTenantInfo(record); + delDaily.setEnergyReadingCalcuteId(record.getId()); + wxAllBillService.deleteEnergyReadingBills(delDaily); + wxAllBillService.insertBills(record.getTenantId(), billList); + }catch(Exception e) { + logger.error("insert bills error.",e); + } + WxEnergyReadingCalcute c = new WxEnergyReadingCalcute(); + c.updateTenantInfo(record); + c.setId(record.getId()); + c.setIsCalcuted(EnumYesOrNo.YES.getCode()); + c.setUpdateTime(new Date()); + c.setUpdateBy(user.getId()); + c.setUpdateByName(user.getName()); + c.setRemark(record.getRemark()); + wxEnergyReadingCalcuteMapper.updateById(c); + } } @Override diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml index dae00949d..39b3f730c 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteMapper.xml @@ -15,7 +15,6 @@ - @@ -23,7 +22,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`create_by`,`create_by_name`, - `update_by`,`update_by_name`,`remark`,`period`,`fees_id`,`is_calcuted`,`calcute_success`,`is_del`,`shop_size`,`shop` + `update_by`,`update_by_name`,`remark`,`period`,`fees_id`,`is_calcuted`,`is_del`,`shop_size`,`shop` @@ -41,7 +40,6 @@ and `create_by` = #{createBy} and `fees_id` = #{feesId} and `is_calcuted` = #{isCalcuted} - and `calcute_success` = #{calcuteSuccess} and `is_del` = #{isDel} and fees_id in diff --git a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml index 105ed0776..5c9bac628 100644 --- a/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxEnergyReadingCalcuteResultMapper.xml @@ -11,13 +11,13 @@ - + - `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`shop_id`,`fees_id`,`fees_shop_id`,`meter_id`,`money`,`period` + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`calcute_id`,`shop_id`,`fees_id`,`fees_shop_id`,`money`,`period`,`money_deail` @@ -36,7 +36,6 @@ and `shop_id` = #{shopId} and `fees_id` = #{feesId} and `fees_shop_id` = #{feesShopId} - and `meter_id` = #{meterId} and id in @@ -73,7 +72,7 @@ ( #{item.id},#{item.tenantId},#{item.parentTenantId},#{item.createTime},#{item.updateTime},#{item.calcuteId}, - #{item.shopId},#{item.feesId},#{item.feesShopId},#{item.meterId},#{item.money},#{item.period} + #{item.shopId},#{item.feesId},#{item.feesShopId},#{item.money},#{item.period},#{item.moneyDeail} )