feat: 增加国旗图标

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreModel.java

@@ -315,7 +315,7 @@ public class StoreModel {
             throw new MallException("添加店铺表失败，请重试");
         }
 
-        //插入storeName表
+        //插入storeName表和 StoreSiteInfo表
         if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(ownStoreAddDTO.getWebSite())) {
             StoreName storeNameInsert = new StoreName();
             storeNameInsert.setStoreId(storeId);
@@ -327,6 +327,16 @@ public class StoreModel {
             if (count == 0) {
                 throw new MallException("添加店铺名称表失败，请重试");
             }
+            StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
+            storeSiteInfo.setStoreId(storeId);
+            storeSiteInfo.setWebSite(ownStoreAddDTO.getWebSite());
+            storeSiteInfo.setBusinessState(StoreConst.STORE_BUSINESS_STATE_DECORATION);
+            storeSiteInfo.setCreateId(0L);
+            storeSiteInfo.setCreateTime(new Date());
+            count = storeSiteInfoWriteMapper.insert(storeSiteInfo);
+            if (count == 0) {
+                throw new MallException("添加店铺站点信息表失败，请重试");
+            }
         }
         //插入vendor表，关联storeId
         Vendor vendor = new Vendor();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/member/FollowProductVO.java

@@ -70,12 +70,12 @@ public class FollowProductVO implements Serializable {
         followId = memberFollowProduct.getFollowId();
         productId = memberFollowProduct.getProductId();
         productPrice = memberFollowProduct.getProductPrice();
-        productImage = FileUrlUtil.getFileUrl(goods.getMainImage(), null);
+        productImage = FileUrlUtil.getFileUrl(goods.getState() == 3 ? goods.getMainImage() : memberFollowProduct.getProductImage(), null);
         goodsId = memberFollowProduct.getGoodsId();
-        goodsName = goods.getGoodsName();
+        goodsName = goods.getState() == 3 ? goods.getGoodsName() : memberFollowProduct.getGoodsName();
         storeId = memberFollowProduct.getStoreId();
         storeName = memberFollowProduct.getStoreName();
-        goodsBrief = goods.getGoodsBrief();
+        goodsBrief = goods.getState() == 3 ? goods.getGoodsBrief() : memberFollowProduct.getGoodsBrief();
         shareLink = DomainUrlUtil.SLD_H5_URL + "/standard/product/detail?productId=" + memberFollowProduct.getProductId() + "&goodsId=" + memberFollowProduct.getGoodsId();
         isOwnStore = store.getIsOwnStore();
         isOwnStoreValue = dealIsOwnStoreValue(store.getIsOwnStore());

xinkeaboard-server/doc/DDL/update.sql

@@ -342,6 +342,8 @@ ALTER TABLE member_product_look_log MODIFY COLUMN goods_name VARCHAR(200) COMMEN
 
 ALTER TABLE member_product_look_log MODIFY COLUMN goods_brief VARCHAR(1000) COMMENT '商品副标题，长度建议140个字符内';
 
+update msg_store_tpl set email_content='{"email_subject":"新询盘提醒-{$siteName}","email_content":"<h2>尊敬的客户，您好：</h2><p>收到询盘信息如下：</p><p>姓 名：{$name}</p><p>邮 箱：{$email}</p><p>国家/地区：{$country}</p><p>联系方式：{$phoneCode}-{$phone}</p><p>数 量：{$quantity}</p><p>询盘内容：{$message}</p><p>访问链接：{$pageUrl}</p>"}'  where tpl_code ='enquiry_reminder'
+