From 1862f1d89a4ae34f9fc07e296fb87ba389f0e109 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 23 Sep 2024 12:30:47 +0800 Subject: [PATCH] fix --- .../src/main/resources/db/migration/V202409000000001.sql | 2 +- .../src/main/java/com/iformall/domain/po/WxMerchant.java | 5 +++-- .../com/iformall/service/impl/WxShopServiceImpl.java | 9 +++++---- .../src/main/resources/mapper/WxMerchantMapper.xml | 7 ++++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql index 26374136b..99077eb83 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202409000000001.sql @@ -589,7 +589,7 @@ ALTER TABLE wx_all_bill_99 ADD COLUMN PERIOD VARCHAR(30) COMMENT '所属年 - +ALTER TABLE wx_merchant ADD COLUMN create_from_data VARCHAR(100) COMMENT '创建来源数据'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 5cd9c8b46..9f20f63df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -157,6 +157,9 @@ public class WxMerchant extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "创建来源Id", name = "createFromId") private String createFromId; + + @io.swagger.annotations.ApiModelProperty(value = "创建来源数据", name = "createFromData") + private String createFromData; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") @@ -282,8 +285,6 @@ public class WxMerchant extends TenantEntity { private Integer shopType; @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") private Long brand; -// @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") -// private Integer type; @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") private String email; @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "title") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 3e07a6177..9ca356784 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -370,9 +370,11 @@ public class WxShopServiceImpl implements WxShopService { if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { WxMerchant merchant = new WxMerchant(); merchant.updateTenantInfo(record); - merchant.setName("[系统房号]"+record.getShopNumber()); - int count = wxMerchantMapper.hasMerchant(merchant); - if (count <= 0 ) { + merchant.setName("[系统铺位号]"+record.getShopNumber()); + merchant.setCreateFromData(record.getShopNumber()); + merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); + List ids = wxMerchantMapper.findIdList(merchant); + if (null == ids || ids.size() <= 0 ) { merchant.setId(idWorker.nextId()); merchant.setLinkPerson("虚拟"); merchant.setLinkPhone("11111111111"); @@ -384,7 +386,6 @@ public class WxShopServiceImpl implements WxShopService { merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); merchant.setBillSetting(3); - merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); merchant.setCreateFromId(String.valueOf(record.getId())); merchant.setCarVendorType(0); merchant.setBusinessId(com.iformall.utils.Constant.default_business); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 3f6be4d7a..606c43b3e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -50,13 +50,14 @@ + m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.search_card_by_phone,m.credit_locked,m.credit_locked,m.entry_amount,m.cash_out_count, - m.cash_out_last_time,m.create_from,m.create_from_id + m.cash_out_last_time,m.create_from,m.create_from_id,m.create_from_data @@ -177,6 +178,10 @@ and m.`create_from_id` = #{createFromId} + + and m.`create_from_data` = #{createFromData} + + and (m.`name` like concat('%', #{searchKey},'%') or m.`link_phone` like concat('%', #{searchKey},'%'))