| @@ -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 '创建来源数据'; | |||||
| @@ -157,6 +157,9 @@ public class WxMerchant extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源Id", name = "createFromId") | @io.swagger.annotations.ApiModelProperty(value = "创建来源Id", name = "createFromId") | ||||
| private String createFromId; | private String createFromId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "创建来源数据", name = "createFromData") | |||||
| private String createFromData; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") | @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "startTime") | ||||
| @@ -282,8 +285,6 @@ public class WxMerchant extends TenantEntity { | |||||
| private Integer shopType; | private Integer shopType; | ||||
| @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") | @io.swagger.annotations.ApiModelProperty(value="品牌",name="brand") | ||||
| private Long brand; | private Long brand; | ||||
| // @io.swagger.annotations.ApiModelProperty(value = "类型EnumRentShopType", name = "type") | |||||
| // private Integer type; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") | @io.swagger.annotations.ApiModelProperty(value = "邮件", name = "email") | ||||
| private String email; | private String email; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "title") | @io.swagger.annotations.ApiModelProperty(value = "副标题", name = "title") | ||||
| @@ -370,9 +370,11 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { | if (record.getType() == EnumRentShopType.XIZILOU.getCode()) { | ||||
| WxMerchant merchant = new WxMerchant(); | WxMerchant merchant = new WxMerchant(); | ||||
| merchant.updateTenantInfo(record); | 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<Long> ids = wxMerchantMapper.findIdList(merchant); | |||||
| if (null == ids || ids.size() <= 0 ) { | |||||
| merchant.setId(idWorker.nextId()); | merchant.setId(idWorker.nextId()); | ||||
| merchant.setLinkPerson("虚拟"); | merchant.setLinkPerson("虚拟"); | ||||
| merchant.setLinkPhone("11111111111"); | merchant.setLinkPhone("11111111111"); | ||||
| @@ -384,7 +386,6 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); | merchant.setIsPublic(EnumMerchantPublic.PRIVATE.getCode()); | ||||
| merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); | merchant.setIsPrivate(EnumYesOrNo.YES.getCode()); | ||||
| merchant.setBillSetting(3); | merchant.setBillSetting(3); | ||||
| merchant.setCreateFrom(EnumMerchantCreateFrom.SYS_SHOP_CREATE.getCode()); | |||||
| merchant.setCreateFromId(String.valueOf(record.getId())); | merchant.setCreateFromId(String.valueOf(record.getId())); | ||||
| merchant.setCarVendorType(0); | merchant.setCarVendorType(0); | ||||
| merchant.setBusinessId(com.iformall.utils.Constant.default_business); | merchant.setBusinessId(com.iformall.utils.Constant.default_business); | ||||
| @@ -50,13 +50,14 @@ | |||||
| <result column="create_from" jdbcType="INTEGER" property="createFrom"/> | <result column="create_from" jdbcType="INTEGER" property="createFrom"/> | ||||
| <result column="create_from_id" jdbcType="VARCHAR" property="createFromId"/> | <result column="create_from_id" jdbcType="VARCHAR" property="createFromId"/> | ||||
| <result column="create_from_data" jdbcType="VARCHAR" property="createFromData"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| 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.`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.`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.`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 | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -177,6 +178,10 @@ | |||||
| and m.`create_from_id` = #{createFromId} | and m.`create_from_id` = #{createFromId} | ||||
| </if> | </if> | ||||
| <if test=" null != createFromData and '' != createFromData"> | |||||
| and m.`create_from_data` = #{createFromData} | |||||
| </if> | |||||
| <if test=" null != searchKey and '' != searchKey "> | <if test=" null != searchKey and '' != searchKey "> | ||||
| and (m.`name` like concat('%', #{searchKey},'%') or m.`link_phone` like concat('%', #{searchKey},'%')) | and (m.`name` like concat('%', #{searchKey},'%') or m.`link_phone` like concat('%', #{searchKey},'%')) | ||||
| </if> | </if> | ||||