diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopUpdateLogoParam.java b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopUpdateLogoParam.java index bc2d53c..123b74f 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopUpdateLogoParam.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/param/shop/ShopUpdateLogoParam.java @@ -70,4 +70,10 @@ public class ShopUpdateLogoParam { @ApiModelProperty(value = "具体跨境信息") private CereShopCrossDetail crossDetail; + /** + * 店铺类型 + */ + @ApiModelProperty(value = "店铺类型") + private Integer shopType; + } diff --git a/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java b/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java index 93e11fe..79c17f2 100644 --- a/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java +++ b/cereshop-business/src/main/java/com/shop/cereshop/business/service/shop/impl/CerePlatformShopServiceImpl.java @@ -128,6 +128,7 @@ public class CerePlatformShopServiceImpl implements CerePlatformShopService { cerePlatformShop.setShopPhone(param.getShopPhone()); cerePlatformShop.setShareDays(param.getShareDays()); cerePlatformShop.setUpdateTime(time); + cerePlatformShop.setShopType(param.getShopType()); return cerePlatformShop; } diff --git a/cereshop-business/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml b/cereshop-business/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml index b9bf3ac..413ed33 100644 --- a/cereshop-business/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml +++ b/cereshop-business/src/main/resources/mybatis/mapper/shop/CerePlatformShopDAO.xml @@ -275,6 +275,9 @@ is_cross = #{isCross,jdbcType=INTEGER}, + + shop_type = #{shopType,jdbcType=INTEGER}, + where shop_id = #{shopId,jdbcType=BIGINT} @@ -283,7 +286,7 @@ SELECT a.shop_id, a.business_id, a.shop_code, a.shop_name, a.shop_brief, a.shop_phone, a.shop_password, a.charge_person_name, a.charge_person_phone, a.shop_adress, a.effective_date, a.effective_year, a.contract_state, a.authentication_state, a.check_state, a.`state`, a.authen_type, a.create_time, a.update_time, - a.audit_live, a.audit_live_product,b.business_name, a.is_cross, a.shop_logo + a.audit_live, a.audit_live_product,b.business_name, a.is_cross, a.shop_logo, a.shop_type FROM cere_platform_shop a INNER JOIN cere_platform_business b ON a.business_id = b.business_id diff --git a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CerePlatformShop.java b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CerePlatformShop.java index 488a1b8..362c7d6 100644 --- a/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CerePlatformShop.java +++ b/cereshop-commons/src/main/java/com/shop/cereshop/commons/domain/shop/CerePlatformShop.java @@ -202,6 +202,13 @@ public class CerePlatformShop implements Serializable { @ApiModelProperty(value = "是否是跨境商家") private Integer isCross; + /** + * 店铺类型 + */ + @ApiModelProperty(value = "店铺类型 1-国内贸易 2-跨境保税 3-海外直邮") + private Integer shopType; + + private static final long serialVersionUID = 1L; } diff --git a/doc/3.0/update.sql b/doc/3.0/update.sql index 1539bfa..4bd42dd 100644 --- a/doc/3.0/update.sql +++ b/doc/3.0/update.sql @@ -285,3 +285,5 @@ ALTER TABLE `cere_shop_product_lang_info` MODIFY COLUMN `product_brief` varchar( #商品平台端分类改为非必填 ALTER TABLE `cere_shop_product` MODIFY COLUMN `classify_id` bigint DEFAULT NULL COMMENT '关联分类id'; + +ALTER TABLE cere_platform_shop ADD shop_type tinyint(1) DEFAULT 1 COMMENT '店铺类型 1国内贸易 2跨境保税 3海外直邮';