From 2b9432e219711608907b185dd3ccafa6f803d09a Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 29 Sep 2024 10:28:40 +0800 Subject: [PATCH] fix --- .../db/migration/数据迁移-万星.sql | 12 +++++++++-- .../service/impl/WxEnergyServiceImpl.java | 20 ++++++++++--------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql b/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql index db2cfc464..072812560 100644 --- a/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql +++ b/mallinkAdmin/src/main/resources/db/migration/数据迁移-万星.sql @@ -2,10 +2,10 @@ ## 2. 写字楼铺位初始化后,需要设置虚拟商户,关联铺位。 INSERT INTO wx_merchant (`id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`, `car_vendor_type`,`status`,`link_person`,`business_id`,`is_public`,`is_private`,`cover_picture`,`bill_setting`,`is_admin`,`top_time`, -`is_del`,`search_card_by_phone`,`credit_locked`,`entry_amount`,`cash_out_number`,`cash_out_count`,`create_from`,`create_from_id`,`create_from_data`) +`is_del`,`search_card_by_phone`,`credit_locked`,`entry_amount`,`cash_out_number`,`cash_out_count`,`create_from`,`create_from_id`,`create_shop_number`,`create_shop_type`) SELECT id ,'1022',NULL,'https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png', CONCAT('[系统铺位号]',shop_number),'11111111111',NOW(),NOW(), 0,1,'虚拟',6,0,1,'["https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png"]',3,0,NOW(), -0,0,0,0,0,0,3,id, shop_number +0,0,0,0,0,0,3,id, shop_number,2 FROM wx_shop WHERE tenant_id = 1022 AND building = 1250 ## 3. 关联虚拟商户和铺位 @@ -28,3 +28,11 @@ SELECT id,'1022',NULL,shop_id,1,1,NAME,link_phone,NOW(),NOW(),0 FROM wx_merchant INSERT INTO `wx_shop_users` (`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`type`,`principal_type`,`name`,`phone`,`create_date`,`update_date`,`status`) SELECT id,'1022',NULL,shop_id,1,1,merchant_name,phone,NOW(),NOW(),0 FROM wx_merchant_shop_mulity_ttttt + + +wx_merchant_shop_567; +wx_merchant_567; + +UPDATE wx_merchant_shop_567 INNER JOIN wx_merchant_567 ON wx_merchant_shop_567.`merchant_id` = wx_merchant_567.`id` +SET wx_merchant_shop_567.`name` = wx_merchant_567.`name`,wx_merchant_shop_567.`phone` = wx_merchant_567.`link_phone`; + 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 9bbc4d8a9..573edf5ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -1311,17 +1311,19 @@ public class WxEnergyServiceImpl implements WxEnergyService { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺"+shop.getShopNumber()+"科目["+fees.getName()+"]该年月已存在计算记录,不能重复计算"); } - //根据店铺,所属年月去查询时间区间.根据店铺,时间区间去查对应的抄表数据,根据表来计算总和 - WxEnergyFeesTimeShop sq = new WxEnergyFeesTimeShop(); - sq.updateTenantInfo(record); - sq.setShopId(shopId); - List timeIds = wxEnergyFeesTimeShopMapper.findTimeIdList(sq); - if (null == timeIds || timeIds.size() <= 0 ) { - throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺"+shop.getShopNumber()+"未设置抄表区间"); - } - //一个年月,一个店铺应该只有一个周期 + //一个年月,一个店铺应该只有一个抄表周期 WxEnergyFeesTime time = null; if (fees.getBillType() == EnumBillAllType.DAILY.getCode()) { + + //根据店铺,所属年月去查询时间区间.根据店铺,时间区间去查对应的抄表数据,根据表来计算总和 + WxEnergyFeesTimeShop sq = new WxEnergyFeesTimeShop(); + sq.updateTenantInfo(record); + sq.setShopId(shopId); + List timeIds = wxEnergyFeesTimeShopMapper.findTimeIdList(sq); + if (null == timeIds || timeIds.size() <= 0 ) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺"+shop.getShopNumber()+"未设置抄表区间"); + } + WxEnergyFeesTime tq = new WxEnergyFeesTime(); tq.updateTenantInfo(record); tq.setIds(timeIds);