chore: merge

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/dto/ArticleAddDTO.java

@@ -16,6 +16,9 @@ public class ArticleAddDTO implements Serializable {
     @ApiModelProperty(value = "分类id",required = true)
     private Integer categoryId;
 
+    @ApiModelProperty(value = "站点",required = true)
+    private String webSite;
+
     @ApiModelProperty(value = "新闻标题",required = true)
     private String title;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/dto/ArticleCategoryAddDTO.java

@@ -13,6 +13,9 @@ public class ArticleCategoryAddDTO implements Serializable {
 
     private static final long serialVersionUID = 1863529423228942801L;
 
+    @ApiModelProperty(value = "站点",required = true)
+    private String webSite;
+
     @ApiModelProperty(value = "分类名称",required = true)
     private String categoryName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/dto/ArticleCategoryUpdateDTO.java

@@ -16,6 +16,9 @@ public class ArticleCategoryUpdateDTO implements Serializable {
     @ApiModelProperty(value = "分类id",required = true)
     private Integer categoryId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/dto/ArticleUpdateDTO.java

@@ -16,6 +16,9 @@ public class ArticleUpdateDTO implements Serializable {
     @ApiModelProperty(value = "文章id",required = true)
     private Integer articleId;
 
+    @ApiModelProperty(value = "站点",required = true)
+    private String webSite;
+
     @ApiModelProperty("分类id")
     private Integer categoryId;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/example/ArticleCategoryExample.java

@@ -26,6 +26,11 @@ public class ArticleCategoryExample implements Serializable {
     private Integer categoryId;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 分类名称
      */
     private String categoryName;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/example/ArticleExample.java

@@ -26,6 +26,11 @@ public class ArticleExample implements Serializable {
     private Integer articleId;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 分类id
      */
     private Integer categoryId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/example/HelpArticleExample.java

@@ -26,6 +26,11 @@ public class HelpArticleExample implements Serializable {
     private Integer articleId;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 分类id
      */
     private Integer categoryId;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/pojo/Article.java

@@ -15,6 +15,9 @@ public class Article implements Serializable {
     @ApiModelProperty("文章id")
     private Integer articleId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类id")
     private Integer categoryId;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/cms/pojo/ArticleCategory.java

@@ -14,6 +14,9 @@ public class ArticleCategory implements Serializable {
     @ApiModelProperty("分类id")
     private Integer categoryId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/OwnStoreAddDTO.java

@@ -16,6 +16,9 @@ public class OwnStoreAddDTO implements Serializable {
     @ApiModelProperty(value = "店铺名称",required = true)
     private String storeName;
 
+    @ApiModelProperty(value = "国内店铺名称",required = true)
+    private String storeNameCn;
+
     @ApiModelProperty(value = "店铺联系人",required = true)
     private String contactName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreBusinessVO.java

@@ -0,0 +1,22 @@
+package com.slodon.b2b2c.seller.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StoreBusinessVO {
+    @ApiModelProperty("站点")
+    private String webSite;
+
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
+    @ApiModelProperty("开店时长")
+    private Integer openTime;
+
+    @ApiModelProperty("店铺等级id")
+    private Integer storeGradeId;
+
+    @ApiModelProperty("店铺等级名称")
+    private String storeGradeName;
+}

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreGradeAddDTO.java

@@ -13,6 +13,9 @@ public class StoreGradeAddDTO implements Serializable {
 
     private static final long serialVersionUID = -689320889381321153L;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty(value = "等级名称",required = true)
     private String gradeName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreGradeUpdateDTO.java

@@ -16,6 +16,9 @@ public class StoreGradeUpdateDTO implements Serializable {
     @ApiModelProperty(value = "等级ID",required = true)
     private Integer gradeId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("等级名称")
     private String gradeName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreUpdateDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lxk
@@ -49,6 +50,9 @@ public class StoreUpdateDTO implements Serializable {
     @ApiModelProperty("开店时长")
     private Integer openTime;
 
+    @ApiModelProperty("店铺经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
     private String paymentName;
 
     @ApiModelProperty("公司名称")

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/example/StoreGradeExample.java

@@ -25,6 +25,11 @@ public class StoreGradeExample implements Serializable {
     private Integer gradeId;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 等级名称
      */
     private String gradeName;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/example/StoreNameExample.java

@@ -24,6 +24,12 @@ public class StoreNameExample implements Serializable {
 
 
     /**
+     * 店铺名称 用于模糊查询
+     */
+    private String storeNameLike;
+
+
+    /**
      * 站点
      */
     private String webSite;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/example/StoreSiteInfoExample.java

@@ -15,6 +15,9 @@ public class StoreSiteInfoExample implements Serializable {
     private Long idNotEquals;
 
 
+    /**
+     * 店铺ID
+     */
     private Long storeId;
 
     /**
@@ -23,6 +26,11 @@ public class StoreSiteInfoExample implements Serializable {
     private String webSite;
 
     /**
+     * 站点等级ID
+     */
+    private Integer storeGradeId;
+
+    /**
      * 分页信息
      */
     private PagerInfo pager;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/StoreApply.java

@@ -37,9 +37,15 @@ public class StoreApply implements Serializable {
     @ApiModelProperty("申请年限，默认为1年")
     private Integer applyYear;
 
+    @ApiModelProperty("国内申请年限，默认为1年")
+    private Integer applyYearCn;
+
     @ApiModelProperty("申请的店铺等级编号")
     private Integer storeGradeId;
 
+    @ApiModelProperty("申请的国内店铺等级编号")
+    private Integer storeGradeIdCn;
+
     @ApiModelProperty("申请的店铺分类")
     private Integer storeCategoryId;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/StoreCmsArticle.java

@@ -16,6 +16,9 @@ public class StoreCmsArticle {
      */
     private Integer articleId;
 
+
+    private String webSite;
+
     /**
      *
      * This field was generated by MyBatis Generator.

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/StoreGrade.java

@@ -15,6 +15,9 @@ public class StoreGrade implements Serializable {
     @ApiModelProperty("等级ID")
     private Integer gradeId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("等级名称")
     private String gradeName;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/pojo/StoreSiteInfo.java

@@ -21,6 +21,20 @@ public class StoreSiteInfo implements Serializable {
     @ApiModelProperty("站点")
     private String webSite;
 
+    @ApiModelProperty("国内店铺等级id")
+    private Integer storeGradeId;
+
+    @ApiModelProperty("国内开店时长")
+    private Integer openTime;
+
+    @ApiModelProperty("国内店铺等级名称")
+    private String storeGradeName;
+
+
+    @ApiModelProperty("国内店铺到期时间")
+    private Date storeExpireTime;
+
+
     @ApiModelProperty("店铺logo")
     private String storeLogo;
 
@@ -45,6 +59,7 @@ public class StoreSiteInfo implements Serializable {
     @ApiModelProperty("店铺地图参数配置-维度")
     private String storeMapInfoW;
 
+
     @ApiModelProperty("创建人")
     private Long createId;
 

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/system/example/AdminEnquiryReceiveMailSettingExample.java

@@ -25,6 +25,11 @@ public class AdminEnquiryReceiveMailSettingExample implements Serializable {
     private Long idNotEqualTo;
 
     /**
+     * 站点
+     */
+    private String webSite;
+
+    /**
      * 邮箱精确查询
      */
     private String email;

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/system/pojo/AdminEnquiryReceiveMailSetting.java

@@ -11,6 +11,8 @@ public class AdminEnquiryReceiveMailSetting implements Serializable {
 
     private Long id;
 
+    private String webSite;
+
     private String email;
 
     private String phone;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/admin/AdminArticleCategoryController.java

@@ -43,15 +43,17 @@ public class AdminArticleCategoryController {
 
     @ApiOperation("文章分类列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "categoryName", value = "分类名称", paramType = "query"),
             @ApiImplicitParam(name = "isShow", value = "是否显示：1-显示，0-不显示", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<ArticleCategoryVO>> getList(HttpServletRequest request, String categoryName, Integer isShow) {
+    public JsonResult<PageVO<ArticleCategoryVO>> getList(HttpServletRequest request,String webSite, String categoryName, Integer isShow) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         ArticleCategoryExample example = new ArticleCategoryExample();
+        example.setWebSite(webSite);
         example.setCategoryNameLike(categoryName);
         //不为空说明是查询显示的，需要排序
         if (!StringUtils.isEmpty(isShow)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/admin/AdminArticleController.java

@@ -43,15 +43,17 @@ public class AdminArticleController {
 
     @ApiOperation("文章列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "title", value = "新闻标题", paramType = "query"),
             @ApiImplicitParam(name = "content", value = "内容", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<ArticleVO>> getList(HttpServletRequest request, String title, String content) {
+    public JsonResult<PageVO<ArticleVO>> getList(HttpServletRequest request, String webSite, String title, String content) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         ArticleExample example = new ArticleExample();
+        example.setWebSite(webSite);
         example.setTitleLike(title);
         example.setContentLike(content);
         List<Article> list = articleModel.getArticleList(example, pager);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/cms/admin/AdminHelpArticleController.java

@@ -44,15 +44,17 @@ public class AdminHelpArticleController {
 
     @ApiOperation("文章列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "title", value = "新闻标题", paramType = "query"),
             @ApiImplicitParam(name = "content", value = "内容", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<HelpArticleVO>> getList(HttpServletRequest request, String title, String content) {
+    public JsonResult<PageVO<HelpArticleVO>> getList(HttpServletRequest request,String webSite, String title, String content) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         HelpArticleExample example = new HelpArticleExample();
+        example.setWebSite(webSite);
         example.setTitleLike(title);
         example.setContentLike(content);
         List<StoreCmsArticle> list = helpArticleModel.getArticleList(example, pager);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/AdminEnquiryController.java

@@ -8,6 +8,7 @@ import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.member.example.MemberEnquiryTrackExample;
 import com.slodon.b2b2c.member.pojo.MemberEnquiry;
 import com.slodon.b2b2c.member.pojo.MemberEnquiryAssign;
@@ -16,10 +17,13 @@ import com.slodon.b2b2c.model.member.advich.MemberEnquiryAssignModel;
 import com.slodon.b2b2c.model.member.advich.MemberEnquiryModel;
 import com.slodon.b2b2c.model.member.advich.MemberEnquiryTrackModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.model.system.AdminModel;
 import com.slodon.b2b2c.seller.example.StoreExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.pojo.Store;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.system.example.AdminExample;
 import com.slodon.b2b2c.system.pojo.Admin;
@@ -68,6 +72,9 @@ public class AdminEnquiryController extends BaseController {
     @Resource
     private StoreModel storeModel;
 
+    @Resource
+    private StoreNameModel storeNameModel;
+
     /**
      * 询盘管理列表
      *
@@ -80,15 +87,16 @@ public class AdminEnquiryController extends BaseController {
     public JsonResult<PageVO<OrderEnquiryVO>> getList(HttpServletRequest request, @RequestParam(value = "name", required = false) String name,
                                                       @RequestParam(value = "email", required = false) String email,
                                                       @RequestParam(value = "validStatus", required = false) Integer validStatus,
-                                                      @RequestParam(value = "storeId", required = false) Long storeId) {
+                                                      @RequestParam(value = "storeId", required = false) Long storeId,
+                                                      @RequestParam(value = "webSite", required = false) String webSite) {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         if(storeId !=null && storeId == 1){
             storeId = 0L;
         }
-        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryAdminListByPage(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus, pager,storeId);
-        pager.setRowsCount(memberEnquiryModel.enquiryAdminListPageCount(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus,storeId));
+        List<MemberEnquiry> list = memberEnquiryModel.getEnquiryAdminListByPage(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus, pager,storeId,webSite);
+        pager.setRowsCount(memberEnquiryModel.enquiryAdminListPageCount(name, email, String.valueOf(admin.getIsSuper()), admin.getAdminId(),validStatus,storeId,webSite));
         ArrayList<OrderEnquiryVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             list.forEach(memberEnquiry -> {
@@ -120,9 +128,24 @@ public class AdminEnquiryController extends BaseController {
 
 
     @GetMapping("store/list")
-    public JsonResult<PageVO<StoreVO>> getStoreList(HttpServletRequest request) {
+    public JsonResult<PageVO<StoreVO>> getStoreList(HttpServletRequest request, @RequestParam(value = "webSite", required = false) String webSite) {
         StoreExample storeExample = new StoreExample();
         List<Store> storeList = storeModel.getStoreList(storeExample,null);
+        if(!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)){
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setWebSite(webSite);
+            List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample,null);
+            if (!CollectionUtils.isEmpty(storeNameList)){
+                storeList.forEach(store -> {
+                    storeNameList.forEach(storeName -> {
+                        if(store.getStoreId().equals(storeName.getStoreId())){
+                            store.setStoreName(storeName.getStoreName());
+                        }
+                    });
+                });
+            }
+        }
+
         ArrayList<StoreVO> vos = new ArrayList<>();
         storeList.forEach(store -> {
             vos.add(new StoreVO(store));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/AdminEnquiryReceiverMailSettingController.java

@@ -45,11 +45,13 @@ public class AdminEnquiryReceiverMailSettingController extends BaseController {
     @GetMapping("list")
     public JsonResult<PageVO<AdminEnquiryReceiverMailVO>> getList(HttpServletRequest request,
                                                                   @RequestParam(value = "email", required = false) String email,
-                                                                  @RequestParam(value = "phone", required = false) String phone) {
+                                                                  @RequestParam(value = "phone", required = false) String phone,
+                                                                  @RequestParam(value = "webSite", required = false) String webSite) {
         Admin admin = UserUtil.getUser(request, Admin.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
         AdminEnquiryReceiveMailSettingExample example = new AdminEnquiryReceiveMailSettingExample();
+        example.setWebSite(webSite);
         example.setEmailLike(email);
         example.setPhoneLike(phone);
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/seller/admin/VendorController.java

@@ -11,6 +11,7 @@ import com.slodon.b2b2c.core.response.PageVO;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.*;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.member.dto.MemberAddDTO;
 import com.slodon.b2b2c.member.dto.MemberIntegralLogUpdateDTO;
 import com.slodon.b2b2c.member.dto.MemberUpdateDTO;
@@ -21,11 +22,14 @@ import com.slodon.b2b2c.model.member.MemberIntegralLogModel;
 import com.slodon.b2b2c.model.member.MemberModel;
 import com.slodon.b2b2c.model.msg.MemberSettingModel;
 import com.slodon.b2b2c.model.seller.StoreApplyModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.model.seller.VendorRolesModel;
 import com.slodon.b2b2c.seller.example.StoreApplyExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.example.VendorExample;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.seller.pojo.VendorRoles;
 import com.slodon.b2b2c.system.pojo.Admin;
@@ -65,6 +69,8 @@ public class VendorController extends BaseController {
     private RedisTemplate<String, Object> objectRedisTemplate;
     @Resource
     private StoreApplyModel storeApplyModel;
+    @Resource
+    private StoreNameModel storeNameModel;
 
     /**
      * 商家列表
@@ -78,6 +84,7 @@ public class VendorController extends BaseController {
      */
     @ApiOperation("商家列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "memberName", value = "会员名称", paramType = "query"),
             @ApiImplicitParam(name = "memberMobile", value = "mobile", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "会员状态：0-禁用，1-启用", paramType = "query"),
@@ -88,6 +95,7 @@ public class VendorController extends BaseController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreVendorVO>> getList(HttpServletRequest request,
+                                                     @RequestParam(value = "webSite", required = false) String webSite,
                                                      @RequestParam(value = "vendorName", required = false) String vendorName,
                                                      @RequestParam(value = "vendorMobile", required = false) String vendorMobile,
                                                      @RequestParam(value = "state", required = false) Integer state,
@@ -115,6 +123,15 @@ public class VendorController extends BaseController {
                 if (!CollectionUtils.isEmpty(storeApplyList)){
                     storeName = storeApplyList.get(0).getStoreName();
                 }
+                if(WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+                    StoreNameExample storeNameExample = new StoreNameExample();
+                    storeNameExample.setStoreId(vendor.getStoreId());
+                    storeNameExample.setWebSite(webSite);
+                    List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+                    if (!CollectionUtils.isEmpty(storeNameList)){
+                        storeName = storeNameList.get(0).getStoreName();
+                    }
+                }
                 StoreVendorVO vo = new StoreVendorVO(vendor,storeName);
                 //获取权限组名称
 //                VendorRoles vendorRoles = vendorRolesModel.getVendorRolesByRolesId(vendor.getRolesId());

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/seller/advich/SellerEnquiryController.java

@@ -1,5 +1,6 @@
 package com.slodon.b2b2c.controller.member.seller.advich;
 
+import com.slodon.b2b2c.core.constant.VendorConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PageVO;
@@ -97,6 +98,7 @@ public class SellerEnquiryController extends BaseController {
     public JsonResult<PageVO<EnquiryVendorVO>> getSubAdminList(HttpServletRequest request) {
         Vendor vendorInfo = UserUtil.getUser(request, Vendor.class);
         VendorExample example = new VendorExample();
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         example.setStoreId(vendorInfo.getStoreId());
         example.setOrderBy("vendor_id asc");
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/seller/SellerVerifyController.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.controller.msg.seller;
 import cn.hutool.extra.mail.MailUtil;
 import com.slodon.b2b2c.core.config.DomainUrlUtil;
 import com.slodon.b2b2c.core.constant.SMSConst;
+import com.slodon.b2b2c.core.constant.VendorConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.random.RandomUtil;
@@ -77,6 +78,7 @@ public class SellerVerifyController extends BaseController {
 
         VendorExample example = new VendorExample();
         example.setVendorMobile(mobile);
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);
 
         // 阿里云发送

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminCateAuditController.java

@@ -9,13 +9,17 @@ import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.model.seller.StoreBindCategoryModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.seller.example.StoreBindCategoryExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.example.VendorExample;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreBindCategory;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.system.pojo.Admin;
 import com.slodon.b2b2c.vo.seller.AuditCateListVO;
@@ -47,10 +51,13 @@ public class AdminCateAuditController {
     @Resource
     private StoreModel storeModel;
     @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
     private VendorModel vendorModel;
 
     @ApiOperation("经营类目列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "storeName", value = "店铺名称", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "审核状态:1-待审核;2-审核通过;3-审核失败", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
@@ -58,12 +65,14 @@ public class AdminCateAuditController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<AuditCateListVO>> getList(HttpServletRequest request,
+                                                       @RequestParam(value = "webSite", required = false) String webSite,
                                                        @RequestParam(value = "storeName", required = false) String storeName,
                                                        @RequestParam(value = "state", required = false) Integer state) {
 
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         StoreBindCategoryExample example = new StoreBindCategoryExample();
         example.setStoreNameLike(storeName);
+        example.setWebSite(webSite);
         example.setState(state);
         example.setStoreIdNotEquals(0);
         example.setOrderBy("create_time desc, bind_id desc");
@@ -92,6 +101,17 @@ public class AdminCateAuditController {
                     vendorMap.put(category.getStoreId(), vendor);
                 }
                 vo.setStoreName(vendor.getStore().getStoreName());
+                if(WebSiteConstant.MEMBER_DISTRIBUTOR.equals(webSite)){
+                    StoreNameExample storeNameExample = new StoreNameExample();
+                    storeNameExample.setStoreId(vendor.getStoreId());
+                    storeNameExample.setStoreNameLike(storeName);
+                    storeNameExample.setWebSite(webSite);
+                    List<StoreName> storeNameList = storeNameModel.getStoreNameList(storeNameExample, null);
+                    if(CollectionUtils.isEmpty(storeNameList)){
+                        return SldResponse.success(new PageVO<>(new ArrayList<>(), new PagerInfo(20, 1)));
+                    }
+                    vo.setStoreName(storeNameList.get(0).getStoreName());
+                }
                 vo.setVendorName(vendor.getVendorName());
                 vos.add(vo);
             }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminOwnStoreController.java

@@ -12,16 +12,20 @@ import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.model.seller.StoreCertificateModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
+import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
 import com.slodon.b2b2c.seller.dto.OwnStoreAddDTO;
 import com.slodon.b2b2c.seller.dto.OwnStoreUpdateDTO;
 import com.slodon.b2b2c.seller.example.StoreCertificateExample;
 import com.slodon.b2b2c.seller.example.StoreExample;
+import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.example.VendorExample;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
+import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
 import com.slodon.b2b2c.system.pojo.Admin;
 import com.slodon.b2b2c.vo.seller.OwnStoreDetailVO;
@@ -37,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -50,6 +55,8 @@ public class AdminOwnStoreController extends BaseController {
     @Resource
     private StoreModel storeModel;
     @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
     private VendorModel vendorModel;
     @Resource
     private StoreCertificateModel storeCertificateModel;
@@ -58,6 +65,7 @@ public class AdminOwnStoreController extends BaseController {
 
     @ApiOperation("自营店铺列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "storeName", value = "店铺名称", paramType = "query"),
             @ApiImplicitParam(name = "state", value = "店铺状态 1、开启；2、关闭", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
@@ -65,21 +73,42 @@ public class AdminOwnStoreController extends BaseController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<OwnStoreVO>> getList(HttpServletRequest request,
+                                                  @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite,
                                                   @RequestParam(value = "storeName", required = false) String storeName,
                                                   @RequestParam(value = "state", required = false) Integer state) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
         StoreExample storeExample = new StoreExample();
-        storeExample.setStoreNameLike(storeName);
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            storeExample.setStoreNameLike(storeName);
+        }
         storeExample.setState(state);
         storeExample.setStateNotEquals(StoreConst.STORE_STATE_DELETE);
         storeExample.setIsOwnStore(StoreConst.IS_OWN_STORE);
         storeExample.setPager(pager);
         List<Store> storeList = storeModel.getStoreList(storeExample, pager);
+        List<StoreName> storeNameList = Collections.emptyList();
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreNameLike(storeName);
+            storeNameExample.setWebSite(webSite);
+            storeNameList = storeNameModel.getStoreNameList(new StoreNameExample(), null);
+        }
         List<OwnStoreVO> vos = new ArrayList<>();
+        if (CollectionUtils.isEmpty(storeNameList) && !WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            return SldResponse.success(new PageVO<>(vos, new PagerInfo(10, 1)));
+        }
         if (!CollectionUtils.isEmpty(storeList)) {
+            List<StoreName> finalStoreNameList = storeNameList;
             storeList.forEach(store -> {
                 OwnStoreVO vo = new OwnStoreVO(store);
+                if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+                    vo.setStoreName(finalStoreNameList.stream()
+                            .filter(storeNameWebSite -> storeNameWebSite.getStoreId().equals(store.getStoreId()))
+                            .findFirst()
+                            .map(StoreName::getStoreName)
+                            .orElse(""));
+                }
                 //根据店铺id获取商户账号
                 VendorExample vendorExample = new VendorExample();
                 vendorExample.setStoreId(store.getStoreId());
@@ -118,6 +147,7 @@ public class AdminOwnStoreController extends BaseController {
                                                   @RequestParam("storeId") Long storeId) {
         //根据店铺id获取店铺信息
         Store store = storeModel.getStoreByStoreId(storeId);
+
         //根据店铺id获取商户账号
         VendorExample vendorExample = new VendorExample();
         vendorExample.setStoreId(store.getStoreId());
@@ -128,6 +158,11 @@ public class AdminOwnStoreController extends BaseController {
         storeCertificateExample.setVendorId(vendorList.get(0).getVendorId());
         StoreCertificate storeCertificate = storeCertificateModel.getStoreCertificateList(storeCertificateExample, null).get(0);
         OwnStoreDetailVO vo = new OwnStoreDetailVO(store, storeCertificate);
+
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreId(storeId);
+        StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+        vo.setStoreNameCn(storeName.getStoreName());
         return SldResponse.success(vo);
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreAuditController.java

@@ -1,39 +1,40 @@
 package com.slodon.b2b2c.controller.seller.admin;
 
-import com.gexin.fastjson.JSON;
 import com.slodon.b2b2c.aop.OperationLogger;
 import com.slodon.b2b2c.core.constant.StoreConst;
+import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.PageVO;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.*;
 import com.slodon.b2b2c.dao.write.seller.StoreWriteMapper;
+import com.slodon.b2b2c.dto.StoreApplyAuditDTO;
+import com.slodon.b2b2c.enums.WebSiteConstant;
+import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.model.goods.GoodsCategoryModel;
 import com.slodon.b2b2c.model.seller.*;
-import com.slodon.b2b2c.seller.example.StoreApplyExample;
-import com.slodon.b2b2c.seller.example.StoreBindCategoryExample;
-import com.slodon.b2b2c.seller.example.StoreCertificateExample;
+import com.slodon.b2b2c.model.system.SettingModel;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
+import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.pojo.Admin;
+import com.slodon.b2b2c.system.pojo.Setting;
 import com.slodon.b2b2c.vo.seller.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -50,6 +51,8 @@ public class AdminStoreAuditController {
     @Resource
     private StoreApplyModel storeApplyModel;
     @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
     private StoreGradeModel storeGradeModel;
     @Resource
     private StoreCertificateModel storeCertificateModel;
@@ -59,9 +62,14 @@ public class AdminStoreAuditController {
     private GoodsCategoryModel goodsCategoryModel;
     @Resource
     private StoreWriteMapper storeWriteMapper;
+    @Autowired
+    private StoreSiteInfoModel storeSiteInfoModel;
+    @Resource
+    private SettingModel settingModel;
 
     @ApiOperation("入驻审核列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "storeName", value = "店铺名称", paramType = "query"),
             @ApiImplicitParam(name = "vendorName", value = "店主账号", paramType = "query"),
             @ApiImplicitParam(name = "storeGradeId", value = "店铺等级", paramType = "query"),
@@ -71,6 +79,7 @@ public class AdminStoreAuditController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreApplyVO>> getList(HttpServletRequest request,
+                                                    @RequestParam(value = "webSite", required = false) String webSite,
                                                     @RequestParam(value = "storeName", required = false) String storeName,
                                                     @RequestParam(value = "vendorName", required = false) String vendorName,
                                                     @RequestParam(value = "storeGradeId", required = false) Integer storeGradeId,
@@ -78,7 +87,9 @@ public class AdminStoreAuditController {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
         StoreApplyExample example = new StoreApplyExample();
-        example.setStoreNameLike(storeName);
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            example.setStoreNameLike(storeName);
+        }
         example.setVendorNameLike(vendorName);
         example.setStoreGradeId(storeGradeId);
         example.setStoreType(StoreConst.NO_OWN_STORE);
@@ -90,8 +101,19 @@ public class AdminStoreAuditController {
             example.setStateNotEquals(StoreConst.STATE_4_STORE_OPEN);
         }
         List<StoreApply> storeApplyList = storeApplyModel.getStoreApplyList(example, pager);
+        List<StoreName> storeNameList = Collections.emptyList();
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreNameLike(storeName);
+            storeNameExample.setWebSite(webSite);
+            storeNameList = storeNameModel.getStoreNameList(new StoreNameExample(), null);
+        }
         List<StoreApplyVO> vos = new ArrayList<>();
+        if (CollectionUtils.isEmpty(storeNameList) && !WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            return SldResponse.success(new PageVO<>(vos, new PagerInfo(10, 1)));
+        }
         if (!CollectionUtils.isEmpty(storeApplyList)) {
+            List<StoreName> finalStoreNameList = storeNameList;
             storeApplyList.forEach(storeApply -> {
                 StoreApplyVO vo = new StoreApplyVO(storeApply);
                 //根据等级id获取等级名称
@@ -99,6 +121,22 @@ public class AdminStoreAuditController {
                 if (storeGrade != null) {
                     vo.setStoreGradeName(storeGrade.getGradeName());
                 }
+                if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+                    vo.setStoreName(finalStoreNameList.stream()
+                            .filter(storeNameWebSite -> storeNameWebSite.getStoreId().equals(storeApply.getStoreId()))
+                            .findFirst()
+                            .map(StoreName::getStoreName)
+                            .orElse(""));
+                    StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+                    storeSiteInfoExample.setStoreId(storeApply.getStoreId());
+                    storeSiteInfoExample.setWebSite(webSite);
+                    StoreSiteInfo storeSiteInfo = storeSiteInfoModel.getStoreSiteInfo(storeSiteInfoExample);
+                    if (storeSiteInfo != null) {
+                        vo.setStoreGradeName(storeSiteInfo.getStoreGradeName());
+                    }
+
+                }
+
                 //获取联系人名称和电话
                 StoreCertificateExample storeCertificateExample = new StoreCertificateExample();
                 storeCertificateExample.setVendorId(storeApply.getVendorId());
@@ -125,6 +163,7 @@ public class AdminStoreAuditController {
         //获取商家申请信息
         StoreApply storeApply = storeApplyModel.getStoreApplyByApplyId(applyId);
 
+
         //获取申请资质信息
         StoreCertificateExample storeCertificateExample = new StoreCertificateExample();
         storeCertificateExample.setVendorId(storeApply.getVendorId());
@@ -137,34 +176,74 @@ public class AdminStoreAuditController {
             vo.setStoreGradeName(storeGrade.getGradeName());
         }
 
+        Store store = storeModel.getStoreByStoreId(storeApply.getStoreId());
+        if (store != null) {
+            vo.setOpenTime(store.getOpenTime());
+        }
+
+        List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+        StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+        storeBusinessVO.setStoreName(vo.getStoreName());
+        storeBusinessVO.setOpenTime(vo.getOpenTime());
+        storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+        storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+        storeBusinessVOList.add(storeBusinessVO);
+
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreId(storeApply.getStoreId());
+        storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+
+        Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeApply.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+        storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+        storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+        storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+        storeBusinessVOList.add(storeBusinessVO);
+
+        vo.setStoreBusinessVOList(storeBusinessVOList);
+
+
+        List<Setting> webSiteList = settingModel.getSiteSetting();
+        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
+        for (Setting setting : webSiteList) {
+            bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
+        }
+        vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
+        return SldResponse.success(vo, logMsg);
+    }
+
+    /**
+     * 构建不同站点经营类目信息
+     * @param storeGoodsCateVOList
+     * @param storeApply
+     * @param webSiteList
+     * @param webSite
+     */
+    private void bulidStoreGoodsCateVOList(List<StoreGoodsCateVO> storeGoodsCateVOList, StoreApply storeApply, List<Setting> webSiteList, String webSite) {
+
         //获取经营类目信息
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
+        storeBindCategoryExample.setWebSite(webSite);
         storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
         List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
-        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
+
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
+
         if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
-            for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
+            storeBindCategoryList.forEach(storeBindCategory -> {
                 StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                if (goodsCategory1 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                if (goodsCategory2 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                if (goodsCategory3 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+                storeGoodsCateVO.setWebSiteName(webSiteList.stream().filter(setting -> setting.getValue().equals(storeBindCategory.getWebSite())).findFirst().map(Setting::getTitle).orElse(""));
+                storeGoodsCateVO.setGoodsCateName1(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId1())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName2(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId2())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                 storeGoodsCateVOList.add(storeGoodsCateVO);
-            }
-            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
+            });
         }
-        return SldResponse.success(vo, logMsg);
     }
 
     @ApiOperation("查看入驻详情所有接口")
@@ -192,34 +271,40 @@ public class AdminStoreAuditController {
                 vo.setStoreGradeName(storeGrade.getGradeName());
             }
 
-            //获取经营类目信息
-            StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
-            storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
-            List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+            Store store = storeModel.getStoreByStoreId(storeApply.getStoreId());
+            vo.setOpenTime(store.getOpenTime());
+
+            List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+            StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+            storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+            storeBusinessVO.setStoreName(vo.getStoreName());
+            storeBusinessVO.setOpenTime(vo.getOpenTime());
+            storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+            storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+            storeBusinessVOList.add(storeBusinessVO);
+
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreId(storeApply.getStoreId());
+            storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+            StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+
+            Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeApply.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
+            storeBusinessVO = new StoreBusinessVO();
+            storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+            storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+            storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+            storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+            storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+            storeBusinessVOList.add(storeBusinessVO);
+
+            vo.setStoreBusinessVOList(storeBusinessVOList);
+
+            List<Setting> webSiteList = settingModel.getSiteSetting();
             List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
-            if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
-                for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
-                    StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                    GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                    if (goodsCategory1 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                    GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                    if (goodsCategory2 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                    GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                    if (goodsCategory3 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
-                    storeGoodsCateVOList.add(storeGoodsCateVO);
-                }
-                vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
-                vos.add(vo);
+            for (Setting setting : webSiteList) {
+                bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
             }
+            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
         }
 
         return SldResponse.success(vos);
@@ -233,68 +318,91 @@ public class AdminStoreAuditController {
             @ApiImplicitParam(name = "isPass", value = "是否通过[true==通过,false==驳回]", required = true),
             @ApiImplicitParam(name = "refuseReason", value = "审核原因，驳回时必填"),
             @ApiImplicitParam(name = "remark", value = "备注，拒绝时选填"),
-            @ApiImplicitParam(name = "scalingBindIds", value = "分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,...")
+            @ApiImplicitParam(name = "scalingBindIds", value = "分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,..."),
+            @ApiImplicitParam(name = "storeGradeId", value = "等级id"),
+            @ApiImplicitParam(name = "storeGradeIdCn", value = "国内店铺等级id"),
+            @ApiImplicitParam(name = "openTime", value = "开店时长"),
+            @ApiImplicitParam(name = "openTimeCn", value = "国内店铺开店时长"),
     })
     @PostMapping("audit")
     public JsonResult<Object> audit(HttpServletRequest request,
-                                    @RequestParam("applyId") Integer applyId,
-                                    @RequestParam("isPass") Boolean isPass,
-                                    @RequestParam(value = "refuseReason", required = false) String refuseReason,
-                                    @RequestParam(value = "remark", required = false) String remark,
-                                    @RequestParam(value = "scalingBindIds", required = false) String scalingBindIds,
-                                    @RequestParam(value = "openTime", required = false) Integer openTime) {
+                                    @RequestBody StoreApplyAuditDTO storeApplyAuditDTO)
+                                    {
 
         Admin admin = UserUtil.getUser(request, Admin.class);
 
-        AssertUtil.isTrue(!isPass && StringUtils.isEmpty(refuseReason), "请填写审核拒绝原因");
-        AssertUtil.isTrue(isPass && StringUtils.isEmpty(scalingBindIds), "请填写分佣比例");
-
-        StoreApply storeApply = storeApplyModel.audit(applyId, isPass, refuseReason, remark, scalingBindIds, admin);
-
-        //根据gradeId查询store_grade表
-        StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
-
-        RegisterPayVO vo = new RegisterPayVO(storeGrade, storeApply);
-        //获取经营类目信息
-        StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
-        storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
-        List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
-        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
-            for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
-                StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                if (goodsCategory1 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                if (goodsCategory2 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                if (goodsCategory3 == null) {
-                    continue;
-                }
-                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
-                storeGoodsCateVOList.add(storeGoodsCateVO);
+        AssertUtil.isTrue(!storeApplyAuditDTO.getIsPass() && StringUtils.isEmpty(storeApplyAuditDTO.getRefuseReason()), "请填写审核拒绝原因");
+//        AssertUtil.isTrue(isPass && StringUtils.isEmpty(scalingBindIds), "请填写分佣比例");
+
+        StoreApply storeApply = storeApplyModel.audit(storeApplyAuditDTO.getApplyId(), storeApplyAuditDTO.getIsPass(), storeApplyAuditDTO.getRefuseReason(), storeApplyAuditDTO.getRemark(), storeApplyAuditDTO.getScalingBindIds(), admin);
+
+//        //根据gradeId查询store_grade表
+//        StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
+//
+//        RegisterPayVO vo = new RegisterPayVO(storeGrade, storeApply);
+//        //获取经营类目信息
+//        StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
+//        storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
+//        List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+//        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
+//        if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
+//            for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
+//                StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
+//                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
+//                if (goodsCategory1 == null) {
+//                    continue;
+//                }
+//                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
+//                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
+//                if (goodsCategory2 == null) {
+//                    continue;
+//                }
+//                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
+//                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
+//                if (goodsCategory3 == null) {
+//                    continue;
+//                }
+//                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+//                storeGoodsCateVOList.add(storeGoodsCateVO);
+//            }
+//            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
+//        }
+        if (storeApplyAuditDTO.getIsPass()) {
+            if (CollectionUtils.isEmpty(storeApplyAuditDTO.getStoreBusinessVOList())){
+                throw new MallException("请选择经营信息");
             }
-            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
-        }
-        if (isPass) {
-            // 店铺审核增加开店时长
-            if (!StringUtil.isNullOrZero(openTime)) {
-                storeApply.setApplyYear(openTime);
-            }else{
-                AssertUtil.isTrue(StringUtil.isNullOrZero(openTime), "请选择开店时长");
+            // 扩展站点可重新设计
+            for (StoreBusinessVO storeBusinessVO : storeApplyAuditDTO.getStoreBusinessVOList()){
+                if(WebSiteConstant.MEMBER_OVERSEA.equals(storeBusinessVO.getWebSite())){
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getOpenTime())){
+                        storeApply.setApplyYear(storeBusinessVO.getOpenTime());
+                    }else {
+                        throw new MallException("请选择开店时长");
+                    }
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getStoreGradeId())){
+                        storeApply.setStoreGradeId(storeBusinessVO.getStoreGradeId());
+                    }else {
+                        throw new MallException("请选择店铺等级");
+                    }
+                }else if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(storeBusinessVO.getWebSite())) {
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getOpenTime())){
+                        storeApply.setApplyYearCn(storeBusinessVO.getOpenTime());
+                    }else {
+                        throw new MallException("请选择开店时长");
+                    }
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getStoreGradeId())){
+                        storeApply.setStoreGradeIdCn(storeBusinessVO.getStoreGradeId());
+                    }else {
+                        throw new MallException("请选择店铺等级");
+                    }
+                }
             }
             //todo 因业务需要暂不用此功能
 //            if (storeApply.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
             storeModel.openStore(storeApply);
 //            }
             storeApplyModel.sendApplyStoreOkSms(storeApply);
-            return SldResponse.success("审核通过", vo);
+            return SldResponse.success("审核通过", storeApply);
         } else {
             ApplyRefuseVO applyRefuseVO = new ApplyRefuseVO(storeApply);
             storeApplyModel.sendApplyStoreFailedSms(storeApply);
@@ -310,17 +418,13 @@ public class AdminStoreAuditController {
             @ApiImplicitParam(name = "isPass", value = "是否通过[true==通过,false==驳回]", required = true),
             @ApiImplicitParam(name = "refuseReason", value = "审核原因，驳回时必填"),
             @ApiImplicitParam(name = "remark", value = "备注，拒绝时选填"),
-            @ApiImplicitParam(name = "scalingBindIds", value = "分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,...")
+            @ApiImplicitParam(name = "scalingBindIds", value = "分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,..."),
+            @ApiImplicitParam(name = "openTime", value = "开店时长"),
     })
     @PostMapping("batchAudit")
-    public JsonResult<Object> batchAudit(HttpServletRequest request,
-                                         @RequestParam("applyIds") String applyIds,
-                                         @RequestParam("isPass") Boolean isPass,
-                                         @RequestParam(value = "refuseReason", required = false) String refuseReason,
-                                         @RequestParam(value = "remark", required = false) String remark,
-                                         @RequestParam(value = "scalingBindIds", required = false) String scalingBindIds,
-                                         @RequestParam(value = "openTime", required = false) Integer openTime) {
+    public JsonResult<Object> batchAudit(HttpServletRequest request,@RequestBody StoreApplyAuditDTO storeApplyAuditDTO) {
         //参数校验
+        String applyIds = storeApplyAuditDTO.getApplyIds();
         AssertUtil.notEmpty(applyIds, "绑定id不能为空");
         AssertUtil.notFormatFrontIds(applyIds, "applyIds格式错误,请重试");
         Admin admin = UserUtil.getUser(request, Admin.class);
@@ -331,6 +435,11 @@ public class AdminStoreAuditController {
         int total = 0;
         RegisterPayVO vo = null;
         ApplyRefuseVO applyRefuseVO = null;
+        Boolean isPass = storeApplyAuditDTO.getIsPass();
+        String refuseReason = storeApplyAuditDTO.getRefuseReason();
+        String remark = storeApplyAuditDTO.getRemark();
+        String scalingBindIds = storeApplyAuditDTO.getScalingBindIds();
+        Integer openTime = storeApplyAuditDTO.getOpenTime();
         for (Integer applyId : array) {
 
             AssertUtil.isTrue(!isPass && StringUtils.isEmpty(refuseReason), "请填写审核拒绝原因");
@@ -342,40 +451,41 @@ public class AdminStoreAuditController {
             StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
 
             vo = new RegisterPayVO(storeGrade, storeApply);
-            //获取经营类目信息
-            StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
-            storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
-            List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
-            List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
-            if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
-                for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
-                    StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                    GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                    if (goodsCategory1 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                    GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                    if (goodsCategory2 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                    GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                    if (goodsCategory3 == null) {
-                        continue;
-                    }
-                    storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
-                    storeGoodsCateVOList.add(storeGoodsCateVO);
-                }
-                vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
-            }
+//            //获取经营类目信息
+//            StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
+//            storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
+//            List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+//            List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
+//            if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
+//                for (StoreBindCategory storeBindCategory : storeBindCategoryList) {
+//                    StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
+//                    GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
+//                    if (goodsCategory1 == null) {
+//                        continue;
+//                    }
+//                    storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
+//                    GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
+//                    if (goodsCategory2 == null) {
+//                        continue;
+//                    }
+//                    storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
+//                    GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
+//                    if (goodsCategory3 == null) {
+//                        continue;
+//                    }
+//                    storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
+//                    storeGoodsCateVOList.add(storeGoodsCateVO);
+//                }
+//                vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
+//            }
 
             if (isPass) {
                 // 店铺审核增加开店时长
                 if (!StringUtil.isNullOrZero(openTime)) {
                     storeApply.setApplyYear(openTime);
+                    storeApply.setApplyYearCn(openTime);
                 }else{
-                    AssertUtil.isTrue(StringUtil.isNullOrZero(openTime), "请选择开店时长");
+                    throw new MallException("请选择开店时长");
                 }
                 int count = storeModel.openStore(storeApply);
                 total += count;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreController.java

@@ -14,13 +14,18 @@ import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
+import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.model.goods.GoodsCategoryModel;
 import com.slodon.b2b2c.model.seller.*;
+import com.slodon.b2b2c.model.system.SettingModel;
 import com.slodon.b2b2c.seller.dto.StoreUpdateDTO;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.pojo.Admin;
+import com.slodon.b2b2c.system.pojo.Setting;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.vo.seller.StoreDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
 import com.slodon.b2b2c.vo.seller.StoreVO;
@@ -49,6 +54,10 @@ public class AdminStoreController extends BaseController {
     @Resource
     private StoreModel storeModel;
     @Resource
+    private StoreNameModel storeNameModel;
+    @Resource
+    private StoreSiteInfoModel storeSiteInfoModel;
+    @Resource
     private VendorModel vendorModel;
     @Resource
     private StoreApplyModel storeApplyModel;
@@ -60,9 +69,12 @@ public class AdminStoreController extends BaseController {
     private GoodsCategoryModel goodsCategoryModel;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private SettingModel settingModel;
 
     @ApiOperation("入驻店铺列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "storeName", value = "店铺名称", paramType = "query"),
             @ApiImplicitParam(name = "vendorName", value = "店主账号", paramType = "query"),
             @ApiImplicitParam(name = "storeGradeId", value = "店铺等级id", paramType = "query"),
@@ -72,6 +84,7 @@ public class AdminStoreController extends BaseController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreVO>> getList(HttpServletRequest request,
+                                               @RequestParam(value = "webSite", required = false) String webSite,
                                                @RequestParam(value = "storeName", required = false) String storeName,
                                                @RequestParam(value = "vendorName", required = false) String vendorName,
                                                @RequestParam(value = "storeGradeId", required = false) Integer storeGradeId,
@@ -80,7 +93,9 @@ public class AdminStoreController extends BaseController {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
         StoreExample storeExample = new StoreExample();
-        storeExample.setStoreNameLike(storeName);
+        if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            storeExample.setStoreNameLike(storeName);
+        }
         storeExample.setVendorNameLike(vendorName);
         storeExample.setStoreGradeId(storeGradeId);
         storeExample.setState(state);
@@ -88,10 +103,28 @@ public class AdminStoreController extends BaseController {
         storeExample.setIsOwnStore(StoreConst.NO_OWN_STORE);
         storeExample.setPager(pager);
         List<Store> storeList = storeModel.getStoreList(storeExample, pager);
+        List<StoreName> storeNameList = Collections.emptyList();
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreNameLike(storeName);
+            storeNameExample.setWebSite(webSite);
+            storeNameList = storeNameModel.getStoreNameList(new StoreNameExample(), null);
+        }
         List<StoreVO> vos = new ArrayList<>();
+        if (CollectionUtils.isEmpty(storeNameList) && !WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            return SldResponse.success(new PageVO<>(vos, new PagerInfo(10, 1)));
+        }
         if (!CollectionUtils.isEmpty(storeList)) {
+            List<StoreName> finalStoreNameList = storeNameList;
             storeList.forEach(store -> {
                 StoreVO vo = new StoreVO(store);
+                if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+                    vo.setStoreName(finalStoreNameList.stream()
+                            .filter(storeNameWebSite -> storeNameWebSite.getStoreId().equals(store.getStoreId()))
+                            .findFirst()
+                            .map(StoreName::getStoreName)
+                            .orElse(""));
+                }
                 //根据店铺id获取商户账号
                 VendorExample vendorExample = new VendorExample();
                 vendorExample.setStoreId(store.getStoreId());
@@ -138,6 +171,31 @@ public class AdminStoreController extends BaseController {
             store.setStoreLogo(store.getStoreLogo());
         }
         StoreDetailVO vo = new StoreDetailVO(store, storeCertificate);
+
+        List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+        StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+        storeBusinessVO.setStoreName(vo.getStoreName());
+        storeBusinessVO.setOpenTime(vo.getOpenTime());
+        storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+        storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+        storeBusinessVOList.add(storeBusinessVO);
+
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreId(storeId);
+        storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+        Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeId, WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+        storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+        storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+        storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+        storeBusinessVOList.add(storeBusinessVO);
+
+        vo.setStoreBusinessVOList(storeBusinessVOList);
+
         //获取应付金额
         vo.setPayAmount(storeApply.getPayAmount());
         //获取支付方式
@@ -145,26 +203,13 @@ public class AdminStoreController extends BaseController {
         //获取支付名称
         vo.setPaymentName(storeApply.getPaymentName());
 
-        //获取经营类目信息
-        StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
-        storeBindCategoryExample.setStoreId(storeApply.getStoreId());
-        storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
-        storeBindCategoryExample.setState(StoreConst.STORE_CATEGORY_STATE_PASS);
-        List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+        List<Setting> webSiteList = settingModel.getSiteSetting();
+
         List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
-            storeBindCategoryList.forEach(storeBindCategory -> {
-                StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
-                GoodsCategory goodsCategory1 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId1());
-                storeGoodsCateVO.setGoodsCateName1(goodsCategory1.getCategoryName());
-                GoodsCategory goodsCategory2 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId2());
-                storeGoodsCateVO.setGoodsCateName2(goodsCategory2.getCategoryName());
-                GoodsCategory goodsCategory3 = goodsCategoryModel.getGoodsCategoryByCategoryId(storeBindCategory.getGoodsCategoryId3());
-                storeGoodsCateVO.setGoodsCateName3(goodsCategory3.getCategoryName());
-                storeGoodsCateVOList.add(storeGoodsCateVO);
-            });
-            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
+        for (Setting setting : webSiteList) {
+            bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
         }
+        vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
 
         //获取结算周期
         if (!StringUtils.isEmpty(store.getBillType()) && !StringUtils.isEmpty(store.getBillDay())) {
@@ -213,12 +258,37 @@ public class AdminStoreController extends BaseController {
         return SldResponse.success(vo);
     }
 
+    private void bulidStoreGoodsCateVOList(List<StoreGoodsCateVO> storeGoodsCateVOList,StoreApply storeApply, List<Setting> webSiteList, String webSite) {
+
+        //获取经营类目信息
+        StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
+        storeBindCategoryExample.setStoreId(storeApply.getStoreId());
+        storeBindCategoryExample.setWebSite(webSite);
+        storeBindCategoryExample.setCreateVendorId(storeApply.getVendorId());
+        storeBindCategoryExample.setState(StoreConst.STORE_CATEGORY_STATE_PASS);
+        List<StoreBindCategory> storeBindCategoryList = storeBindCategoryModel.getStoreBindCategoryList(storeBindCategoryExample, null);
+
+        GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
+
+        if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
+            storeBindCategoryList.forEach(storeBindCategory -> {
+                StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
+                storeGoodsCateVO.setWebSiteName(webSiteList.stream().filter(setting -> setting.getValue().equals(storeBindCategory.getWebSite())).findFirst().map(Setting::getTitle).orElse(""));
+                storeGoodsCateVO.setGoodsCateName1(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId1())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName2(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId2())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
+                storeGoodsCateVOList.add(storeGoodsCateVO);
+            });
+        }
+    }
+
     @ApiOperation("编辑店铺详情信息")
     @OperationLogger(option = "编辑店铺详情信息")
     @PostMapping("edit")
-    public JsonResult<Object> editStore(HttpServletRequest request, StoreUpdateDTO storeUpdateDTO) {
+    public JsonResult<Object> editStore(HttpServletRequest request, @RequestBody StoreUpdateDTO storeUpdateDTO) {
         String logMsg = "店铺id" + storeUpdateDTO.getStoreId();
-        storeModel.editStoreInfo(storeUpdateDTO);
+        storeModel.editStoreInfo(request,storeUpdateDTO);
         return SldResponse.success("编辑成功", logMsg);
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreGradeController.java

@@ -10,14 +10,17 @@ import com.slodon.b2b2c.core.util.WebUtil;
 import com.slodon.b2b2c.model.seller.StoreApplyModel;
 import com.slodon.b2b2c.model.seller.StoreGradeModel;
 import com.slodon.b2b2c.model.seller.StoreRenewModel;
+import com.slodon.b2b2c.model.seller.StoreSiteInfoModel;
 import com.slodon.b2b2c.seller.dto.StoreGradeAddDTO;
 import com.slodon.b2b2c.seller.dto.StoreGradeUpdateDTO;
 import com.slodon.b2b2c.seller.example.StoreApplyExample;
 import com.slodon.b2b2c.seller.example.StoreGradeExample;
 import com.slodon.b2b2c.seller.example.StoreRenewExample;
+import com.slodon.b2b2c.seller.example.StoreSiteInfoExample;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
 import com.slodon.b2b2c.seller.pojo.StoreGrade;
 import com.slodon.b2b2c.seller.pojo.StoreRenew;
+import com.slodon.b2b2c.seller.pojo.StoreSiteInfo;
 import com.slodon.b2b2c.vo.seller.StoreGradeVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -44,10 +47,13 @@ public class AdminStoreGradeController {
     @Resource
     private StoreApplyModel storeApplyModel;
     @Resource
+    private StoreSiteInfoModel storeSiteInfoModel;
+    @Resource
     private StoreRenewModel storeRenewModel;
 
     @ApiOperation("店铺等级列表")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "gradeName", value = "等级名称", paramType = "query"),
             @ApiImplicitParam(name = "isSort", value = "是否排序：true-排序，false-不显示", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
@@ -55,11 +61,13 @@ public class AdminStoreGradeController {
     })
     @GetMapping("list")
     public JsonResult<PageVO<StoreGradeVO>> getList(HttpServletRequest request,
+                                                    @RequestParam(value = "webSite", required = false) String webSite,
                                                     @RequestParam(value = "gradeName", required = false) String gradeName,
                                                     @RequestParam(value = "isSort", defaultValue = "false", required = false) Boolean isSort) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
         StoreGradeExample example = new StoreGradeExample();
+        example.setWebSite(webSite);
         example.setGradeNameLike(gradeName);
         if (isSort) {
             example.setOrderBy("sort asc");
@@ -114,6 +122,11 @@ public class AdminStoreGradeController {
         List<StoreApply> storeApplyList = storeApplyModel.getStoreApplyList(example, null);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(storeApplyList), "使用中的等级不能删除");
 
+        StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+        storeSiteInfoExample.setStoreGradeId(gradeId);
+        List<StoreSiteInfo> storeSiteInfoList = storeSiteInfoModel.getStoreSiteInfoList(storeSiteInfoExample, null);
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(storeSiteInfoList), "使用中的等级不能删除");
+
         StoreRenewExample storeRenewExample = new StoreRenewExample();
         storeRenewExample.setGradeId(gradeId);
         List<StoreRenew> storeRenewList = storeRenewModel.getStoreRenewList(storeRenewExample, null);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerRolesController.java

@@ -188,6 +188,7 @@ public class SellerRolesController extends BaseController {
         //角色是否绑定账号，如果绑定则不能删除
         VendorExample vendorExample = new VendorExample();
         vendorExample.setRolesId(rolesId);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该权限组绑定了账号，不能删除");
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerVendorController.java

@@ -243,17 +243,20 @@ public class SellerVendorController extends BaseController {
         //根据手机号查询数据库
         VendorExample vendorExample = new VendorExample();
         vendorExample.setVendorMobile(mobile);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(vendorList), "对不起，该手机号未注册");
 
         VendorExample vendorNameExample = new VendorExample();
         vendorNameExample.setVendorName(vendorName);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorNameList = vendorModel.getVendorList(vendorNameExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(vendorNameList), "对不起，该商家账户未注册");
 
         VendorExample allVendorExample = new VendorExample();
         allVendorExample.setVendorMobile(mobile);
         allVendorExample.setVendorName(vendorName);
+        vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> allVendorList = vendorModel.getVendorList(allVendorExample, null);
         AssertUtil.isTrue(CollectionUtils.isEmpty(allVendorList), "对不起，该商家账户和手机号不匹配");
 
@@ -335,6 +338,7 @@ public class SellerVendorController extends BaseController {
         //查询该手机号是否已注册过
         VendorExample example = new VendorExample();
         example.setVendorMobile(vendorRegisterDTO.getVendorMobile());
+        example.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorModel.getVendorList(example, null);
 
         AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "此手机号已绑定商家账号");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/sso/seller/SellerAuthController.java

@@ -95,6 +95,7 @@ public class SellerAuthController {
             // 登录验证
             VendorExample vendorExample = new VendorExample();
             vendorExample.setVendorName(username);
+            vendorExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
             List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
             if (CollectionUtils.isEmpty(vendorList)) {
                 // 检测gp系统用户是否存在

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/front/FrontPcDecoController.java

@@ -155,24 +155,27 @@ public class FrontPcDecoController {
                 Long goodsId = jsonObject.getLong("goodsId");
                 //查询商品信息
                 Goods goods = goodsModel.getGoodsByGoodsId(goodsId);
-                if (goods != null) {
-                    if (jsonObject.containsKey("actualSales")) {
-                        //销量
-                        int salesVolume = goods.getActualSales() + goods.getVirtualSales();
-                        jsonObject.put("actualSales", salesVolume);
-                    }
-                    if (jsonObject.containsKey("goodsPrice")) {
-                        //价格
-                        jsonObject.put("goodsPrice", goods.getGoodsPrice());
-                    }
-                    if (jsonObject.containsKey("mainImage")) {
-                        //图片
-                        jsonObject.put("mainImage", FileUrlUtil.getFileUrl(goods.getMainImage(), null));
-                    }
-                    if (jsonObject.containsKey("goodsName")) {
-                        //名称
-                        jsonObject.put("goodsName", goods.getGoodsName());
-                    }
+                // 如果商品不存在或不是上架状态，则从JSON中移除该商品
+                if (goods == null || goods.getState() == null || goods.getState() != 3) {
+                    // 标记需要移除的商品，但不在遍历过程中直接移除
+                    return;
+                }
+                if (jsonObject.containsKey("actualSales")) {
+                    //销量
+                    int salesVolume = goods.getActualSales() + goods.getVirtualSales();
+                    jsonObject.put("actualSales", salesVolume);
+                }
+                if (jsonObject.containsKey("goodsPrice")) {
+                    //价格
+                    jsonObject.put("goodsPrice", goods.getGoodsPrice());
+                }
+                if (jsonObject.containsKey("mainImage")) {
+                    //图片
+                    jsonObject.put("mainImage", FileUrlUtil.getFileUrl(goods.getMainImage(), null));
+                }
+                if (jsonObject.containsKey("goodsName")) {
+                    //名称
+                    jsonObject.put("goodsName", goods.getGoodsName());
                 }
             }
             jsonObject.values().forEach(this::dealGoodsSale);
@@ -180,7 +183,21 @@ public class FrontPcDecoController {
         }
         if (object instanceof JSONArray) {
             JSONArray o = (JSONArray) object;
-            o.forEach(this::dealGoodsSale);
+            // 使用迭代器以便在遍历过程中安全地移除元素
+            o.removeIf(item -> {
+                if (item instanceof JSONObject) {
+                    JSONObject jsonObject = (JSONObject) item;
+                    if (jsonObject.containsKey("goodsId")) {
+                        Long goodsId = jsonObject.getLong("goodsId");
+                        Goods goods = goodsModel.getGoodsByGoodsId(goodsId);
+                        // 如果商品不存在或不是上架状态，则移除该商品
+                        return goods == null || goods.getState() == null || goods.getState() != 3;
+                    }
+                }
+                // 对于数组中的其他元素，递归处理
+                dealGoodsSale(item);
+                return false;
+            });
         }
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dao/read/member/MemberEnquiryReadMapper.java

@@ -74,7 +74,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                              @Param("validStatus") Integer validStatus,
                                              @Param("startRow") Integer startRow,
                                              @Param("size") Integer size,
-                                             @Param("storeId") Long storeId);
+                                             @Param("storeId") Long storeId,
+                                             @Param("webSite") String webSite);
 
     /**
      * 平台端-询盘数量
@@ -84,6 +85,7 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
      * @param isSupAdmin
      * @param sysAdminId
      * @param validStatus
+     * @param webSite
      * @return
      */
     Integer enquiryAdminListPageCount(@Param("nameLike") String name,
@@ -91,7 +93,8 @@ public interface MemberEnquiryReadMapper extends BaseReadMapper<MemberEnquiry, M
                                       @Param("isSupAdmin") String isSupAdmin,
                                       @Param("sysAdminId") Integer sysAdminId,
                                       @Param("validStatus") Integer validStatus,
-                                      @Param("storeId") Long storeId);
+                                      @Param("storeId") Long storeId,
+                                      @Param("webSite") String webSite);
 
     /**
      * 卖家端-询盘趋势-天数

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dto/StoreApplyAuditDTO.java

@@ -0,0 +1,27 @@
+package com.slodon.b2b2c.dto;
+
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class StoreApplyAuditDTO {
+    @ApiModelProperty("申请id")
+    private Integer applyId;
+    @ApiModelProperty("申请集合")
+    private String applyIds;
+    @ApiModelProperty("是否通过[true==通过,false==驳回]")
+    private Boolean isPass;
+    @ApiModelProperty("审核原因，驳回时必填")
+    private String refuseReason;
+    @ApiModelProperty("备注，拒绝时选填")
+    private String remark;
+    @ApiModelProperty("分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,...")
+    private String scalingBindIds;
+    @ApiModelProperty("开店时长")
+    private Integer openTime;
+    @ApiModelProperty("经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/cms/ArticleCategoryModel.java

@@ -59,6 +59,7 @@ public class ArticleCategoryModel {
     public Integer saveArticleCategory(ArticleCategoryAddDTO articleCategoryAddDTO, Admin admin) throws Exception {
         //判断分类名称是否重复
         ArticleCategoryExample articleCategoryExample = new ArticleCategoryExample();
+        articleCategoryExample.setWebSite(articleCategoryAddDTO.getWebSite());
         //去掉头尾空格字符
         articleCategoryExample.setCategoryName(StringUtil.trim(articleCategoryAddDTO.getCategoryName()));
         List<ArticleCategory> list = articleCategoryReadMapper.listByExample(articleCategoryExample);
@@ -68,6 +69,7 @@ public class ArticleCategoryModel {
 
         ArticleCategory articleCategoryInsert = new ArticleCategory();
         articleCategoryInsert.setCreateId(admin.getAdminId());
+        articleCategoryInsert.setWebSite(articleCategoryAddDTO.getWebSite());
         articleCategoryInsert.setCategoryName(articleCategoryAddDTO.getCategoryName());
         articleCategoryInsert.setSort(articleCategoryAddDTO.getSort());
         articleCategoryInsert.setIsShow(ArticleConst.STATE_YES);
@@ -161,6 +163,7 @@ public class ArticleCategoryModel {
             //判断分类名称是否重复
             ArticleCategoryExample articleCategoryExample = new ArticleCategoryExample();
             articleCategoryExample.setCategoryIdNotEquals(articleCategoryUpdateDTO.getCategoryId());
+            articleCategoryExample.setWebSite(articleCategoryUpdateDTO.getWebSite());
             articleCategoryExample.setCategoryName(StringUtil.trim(articleCategoryUpdateDTO.getCategoryName()));
             List<ArticleCategory> list = articleCategoryReadMapper.listByExample(articleCategoryExample);
             if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/cms/ArticleModel.java

@@ -56,6 +56,7 @@ public class ArticleModel {
     public Integer saveArticle(ArticleAddDTO articleAddDTO, Admin admin) throws Exception {
         //根据文章标题查重
         ArticleExample articleExample = new ArticleExample();
+        articleExample.setWebSite(articleAddDTO.getWebSite());
         articleExample.setTitle(articleAddDTO.getTitle());
         List<Article> list = articleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {
@@ -139,6 +140,7 @@ public class ArticleModel {
         //根据文章标题查重
         ArticleExample articleExample = new ArticleExample();
         articleExample.setArticleIdNotEquals(articleUpdateDTO.getArticleId());
+        articleExample.setWebSite(articleUpdateDTO.getWebSite());
         articleExample.setTitle(articleUpdateDTO.getTitle());
         List<Article> list = articleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/cms/HelpArticleModel.java

@@ -56,6 +56,7 @@ public class HelpArticleModel {
     public Integer saveArticle(ArticleAddDTO articleAddDTO, Admin admin) throws Exception {
         //根据文章标题查重
         HelpArticleExample articleExample = new HelpArticleExample();
+        articleExample.setWebSite(articleAddDTO.getWebSite());
         articleExample.setTitle(articleAddDTO.getTitle());
         List<StoreCmsArticle> list = helpArticleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {
@@ -139,6 +140,7 @@ public class HelpArticleModel {
         //根据文章标题查重
         HelpArticleExample articleExample = new HelpArticleExample();
         articleExample.setArticleIdNotEquals(articleUpdateDTO.getArticleId());
+        articleExample.setWebSite(articleUpdateDTO.getWebSite());
         articleExample.setTitle(articleUpdateDTO.getTitle());
         List<StoreCmsArticle> list = helpArticleReadMapper.listByExample(articleExample);
         if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/MemberModel.java

@@ -91,10 +91,11 @@ public class MemberModel {
         List<Member> list = memberReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "会员名称重复,请重新填写");
 
-//        example.setMemberName(null);
-//        example.setMemberMobile(memberAddDTO.getMemberMobile());
-//        List<Member> mobileList = memberReadMapper.listByExample(example);
-//        AssertUtil.isTrue(!CollectionUtils.isEmpty(mobileList), "该手机号已经绑定会员");
+        example.setMemberName(null);
+        example.setWebSite(memberAddDTO.getWebSite());
+        example.setMemberMobile(memberAddDTO.getMemberMobile());
+        List<Member> mobileList = memberReadMapper.listByExample(example);
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(mobileList), "该手机号已经绑定会员");
 
         //新增
         Member insertOne = new Member();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/AdminEnquiryReceiverMailSettingModel.java

@@ -41,11 +41,13 @@ public class AdminEnquiryReceiverMailSettingModel {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryReceiveMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
+        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
         adminEnquiryReceiveMailSettingExample.setEmail(adminEnquiryReceiveMailSetting.getEmail());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryReceiveMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryReceiveMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryPhoneMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
+        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
         adminEnquiryPhoneMailSettingExample.setPhone(adminEnquiryReceiveMailSetting.getPhone());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryPhoneMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryPhoneMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryPhoneMailSettings), "该手机号已添加，无需重复添加");
@@ -69,12 +71,14 @@ public class AdminEnquiryReceiverMailSettingModel {
         Admin admin = UserUtil.getUser(request, Admin.class);
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryReceiveMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
+        adminEnquiryReceiveMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
         adminEnquiryReceiveMailSettingExample.setEmail(adminEnquiryReceiveMailSetting.getEmail());
         adminEnquiryReceiveMailSettingExample.setIdNotEqualTo(adminEnquiryReceiveMailSetting.getId());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryReceiveMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryReceiveMailSettingExample);
         AssertUtil.isTrue(!CollectionUtil.isEmpty(adminEnquiryReceiveMailSettings), "该邮箱已添加，无需重复添加");
 
         AdminEnquiryReceiveMailSettingExample adminEnquiryPhoneMailSettingExample = new AdminEnquiryReceiveMailSettingExample();
+        adminEnquiryPhoneMailSettingExample.setWebSite(adminEnquiryReceiveMailSettingExample.getWebSite());
         adminEnquiryPhoneMailSettingExample.setPhone(adminEnquiryReceiveMailSetting.getPhone());
         adminEnquiryPhoneMailSettingExample.setIdNotEqualTo(adminEnquiryReceiveMailSetting.getId());
         List<AdminEnquiryReceiveMailSetting> adminEnquiryPhoneMailSettings = adminEnquiryReceiveMailSettingReadMapper.listByExample(adminEnquiryPhoneMailSettingExample);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/MemberEnquiryModel.java

@@ -515,10 +515,10 @@ public class MemberEnquiryModel {
      * @param email 查询条件信息
      * @param pager 分页信息
      */
-    public List<MemberEnquiry> getEnquiryAdminListByPage(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, PagerInfo pager, Long storeId) {
+    public List<MemberEnquiry> getEnquiryAdminListByPage(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, PagerInfo pager, Long storeId, String webSite) {
         List<MemberEnquiry> enquiryList = null;
         if (pager != null) {
-            enquiryList = memberEnquiryReadMapper.enquiryAdminListPage(name, email, isSupAdmin, sysAdminId, validStatus, pager.getStart(), pager.getPageSize(), storeId);
+            enquiryList = memberEnquiryReadMapper.enquiryAdminListPage(name, email, isSupAdmin, sysAdminId, validStatus, pager.getStart(), pager.getPageSize(), storeId, webSite);
         }
         return enquiryList;
     }
@@ -530,8 +530,8 @@ public class MemberEnquiryModel {
      * @param email 查询条件信息
      * @return 购物车列表
      */
-    public Integer enquiryAdminListPageCount(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, Long storeId) {
-        return memberEnquiryReadMapper.enquiryAdminListPageCount(name, email, isSupAdmin, sysAdminId, validStatus, storeId);
+    public Integer enquiryAdminListPageCount(String name, String email, String isSupAdmin, Integer sysAdminId, Integer validStatus, Long storeId, String webSite) {
+        return memberEnquiryReadMapper.enquiryAdminListPageCount(name, email, isSupAdmin, sysAdminId, validStatus, storeId, webSite);
     }
 
     /**

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

@@ -91,12 +91,13 @@ public class StoreCreateDataModel {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer getNewStoreDefaultTpl(Vendor vendor, StoreApply storeApply) {
+    public Integer getNewStoreDefaultTpl(Vendor vendor, StoreApply storeApply,String webSite) {
         int decoId = TplPcConst.TPL_DEFAULT_1;
         TplPcMallDeco tplPcMallDecoDb = tplPcMallDecoModel.getTplPcMallDecoByDecoId(decoId);
         AssertUtil.notNull(tplPcMallDecoDb, "店铺默认首页不存在，请重新选择");
 
         TplPcMallDeco deco = new TplPcMallDeco();
+        deco.setWebSite(webSite);
         deco.setDecoType(tplPcMallDecoDb.getDecoType());
         deco.setDecoName(tplPcMallDecoDb.getDecoName() + "-" + storeApply.getStoreName());
         deco.setData(tplPcMallDecoDb.getData());

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

@@ -53,6 +53,7 @@ public class StoreGradeModel {
     public Integer saveStoreGrade(StoreGradeAddDTO storeGradeAddDTO) throws Exception {
         //判断等级名称是否重复
         StoreGradeExample example = new StoreGradeExample();
+        example.setWebSite(storeGradeAddDTO.getWebSite());
         example.setGradeName(storeGradeAddDTO.getGradeName());
         List<StoreGrade> storeGrades = storeGradeReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(storeGrades)) {
@@ -114,6 +115,7 @@ public class StoreGradeModel {
         //判断等级名称是否重复
         if (!StringUtil.isEmpty(storeGradeUpdateDTO.getGradeName())) {
             StoreGradeExample example = new StoreGradeExample();
+            example.setWebSite(storeGradeUpdateDTO.getWebSite());
             example.setGradeName(storeGradeUpdateDTO.getGradeName());
             example.setGradeIdNotEquals(storeGradeUpdateDTO.getGradeId());
             List<StoreGrade> storeGrades = storeGradeReadMapper.listByExample(example);

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

@@ -6,10 +6,7 @@ import com.slodon.b2b2c.core.constant.*;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.uid.GoodsIdGenerator;
-import com.slodon.b2b2c.core.util.AssertUtil;
-import com.slodon.b2b2c.core.util.Md5;
-import com.slodon.b2b2c.core.util.StringUtil;
-import com.slodon.b2b2c.core.util.TimeUtil;
+import com.slodon.b2b2c.core.util.*;
 import com.slodon.b2b2c.dao.read.business.OrderReadMapper;
 import com.slodon.b2b2c.dao.read.goods.GoodsExtendReadMapper;
 import com.slodon.b2b2c.dao.read.goods.GoodsReadMapper;
@@ -20,6 +17,7 @@ import com.slodon.b2b2c.dao.write.goods.GoodsExtendWriteMapper;
 import com.slodon.b2b2c.dao.write.goods.GoodsWriteMapper;
 import com.slodon.b2b2c.dao.write.seller.*;
 import com.slodon.b2b2c.dao.write.system.SysSeoWriteMapper;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.example.GoodsExample;
 import com.slodon.b2b2c.goods.example.GoodsExtendExample;
@@ -33,6 +31,7 @@ import com.slodon.b2b2c.seller.dto.*;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.example.SysSeoExample;
+import com.slodon.b2b2c.system.pojo.Admin;
 import com.slodon.b2b2c.system.pojo.SysSeo;
 import com.slodon.b2b2c.system.pojo.TplPcMallDeco;
 import com.slodon.b2b2c.vo.goods.SysSeoVO;
@@ -47,6 +46,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -63,6 +63,12 @@ public class StoreModel {
     @Resource
     private StoreWriteMapper storeWriteMapper;
     @Resource
+    private StoreNameReadMapper storeNameReadMapper;
+    @Resource
+    private StoreNameWriteMapper storeNameWriteMapper;
+    @Resource
+    private StoreSiteInfoWriteMapper  storeSiteInfoWriteMapper;
+    @Resource
     private VendorReadMapper vendorReadMapper;
     @Resource
     private VendorWriteMapper vendorWriteMapper;
@@ -171,6 +177,29 @@ public class StoreModel {
             throw new MallException("添加店铺表失败，请重试");
         }
 
+        //新增storeSiteInfo表
+        StoreSiteInfo storeSiteInfo = new StoreSiteInfo();
+        storeSiteInfo.setStoreId(storeApply.getStoreId());
+        storeSiteInfo.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeSiteInfo.setStoreGradeId(storeApply.getStoreGradeIdCn());
+        storeGrade = storeGradeReadMapper.getByPrimaryKey(storeSiteInfo.getStoreGradeId());
+        storeSiteInfo.setStoreGradeName(storeGrade.getGradeName());
+
+        if (!StringUtil.isNullOrZero(storeApply.getApplyYearCn())) {
+            //开店时长
+            storeSiteInfo.setOpenTime(storeApply.getApplyYearCn());
+            //店铺到期时间
+            calendar = Calendar.getInstance();
+            calendar.setTime(store.getCreateTime());
+            calendar.add(Calendar.YEAR, storeSiteInfo.getOpenTime());
+            storeSiteInfo.setStoreExpireTime(calendar.getTime());
+        }
+
+        count = storeSiteInfoWriteMapper.insert(storeSiteInfo);
+        if (count == 0) {
+            throw new MallException("添加店铺表国内站失败，请重试");
+        }
+
         //修改商家申请表申请状态
         storeApply.setState(StoreConst.STATE_4_STORE_OPEN);
         storeApply.setStoreId(store.getStoreId());
@@ -200,9 +229,10 @@ public class StoreModel {
             throw new MallException("修改商家管理员表失败，请重试");
         }
 
-        //复制店铺默认首页,用于入驻店铺初始默认首页
+        //复制店铺默认首页,用于入驻店铺初始默认首页 国外站和国内站都复制
         log.info("***** 卖家入驻-复制店铺默认首页，用于入驻店铺初始默认首页 *****");
-        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApply);
+        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApply, WebSiteConstant.MEMBER_OVERSEA);
+        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApply, WebSiteConstant.MEMBER_DISTRIBUTOR);
 
         return count;
     }
@@ -215,18 +245,28 @@ public class StoreModel {
      */
     @Transactional(rollbackFor = Exception.class)
     public Integer saveStore(OwnStoreAddDTO ownStoreAddDTO) {
-        //判断店铺名称是否重复
+        //判断海外店铺名称是否重复
         StoreExample storeExample = new StoreExample();
         storeExample.setStoreName(ownStoreAddDTO.getStoreName());
         storeExample.setStateNotEquals(StoreConst.STORE_STATE_DELETE);
         List<Store> stores = storeReadMapper.listByExample(storeExample);
         if (!CollectionUtils.isEmpty(stores)) {
-            throw new MallException("店铺名称已存在，请重新填写");
+            throw new MallException("海外站店铺名称已存在，请重新填写");
+        }
+
+        //判断国内店铺名称是否重复
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreName(ownStoreAddDTO.getStoreNameCn());
+        storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        List<StoreName> storeNames = storeNameReadMapper.listByExample(storeNameExample);
+        if (!CollectionUtils.isEmpty(storeNames)) {
+            throw new MallException("国内站店铺名称已存在，请重新填写");
         }
 
         //插入store表
+        Long storeId = SmartId.nextId(BizTypeConst.STORE);
         Store storeInsert = new Store();
-        storeInsert.setStoreId(SmartId.nextId(BizTypeConst.STORE));
+        storeInsert.setStoreId(storeId);
         storeInsert.setStoreName(ownStoreAddDTO.getStoreName());
         storeInsert.setCreateTime(new Date());
         storeInsert.setIsOwnStore(StoreConst.IS_OWN_STORE);
@@ -272,6 +312,18 @@ public class StoreModel {
             throw new MallException("添加店铺表失败，请重试");
         }
 
+        //插入storeName表
+        StoreName storeNameInsert = new StoreName();
+        storeNameInsert.setStoreId(storeId);
+        storeNameInsert.setStoreName(ownStoreAddDTO.getStoreNameCn());
+        storeNameInsert.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeNameInsert.setCreateId(0L);
+        storeNameInsert.setCreateTime(new Date());
+        count = storeNameWriteMapper.insert(storeNameInsert);
+        if (count == 0) {
+            throw new MallException("添加店铺名称表失败，请重试");
+        }
+
         //插入vendor表，关联storeId
         Vendor vendor = new Vendor();
 
@@ -287,7 +339,7 @@ public class StoreModel {
         vendorMobileExample.setVendorMobile(ownStoreAddDTO.getContactPhone());
         vendorMobileExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
         List<Vendor> vendorList = vendorReadMapper.listByExample(vendorMobileExample);
-//        AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
+        AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
 
         vendor.setVendorMobile(ownStoreAddDTO.getContactPhone());
         vendor.setVendorId(SmartId.nextId(BizTypeConst.VENDOR));
@@ -340,7 +392,8 @@ public class StoreModel {
 
         //复制店铺默认首页，用于自营店铺初始默认首页
         log.info("***** 创建自营店铺-复制店铺默认首页，用于创建自营店铺初始默认首页 *****");
-        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApplyInsert);
+        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApplyInsert, WebSiteConstant.MEMBER_OVERSEA);
+        storeCreateDataModel.getNewStoreDefaultTpl(vendor, storeApplyInsert, WebSiteConstant.MEMBER_DISTRIBUTOR);
 
         return count;
     }
@@ -612,8 +665,9 @@ public class StoreModel {
             VendorExample vendorMobileExample = new VendorExample();
             vendorMobileExample.setVendorMobile(ownStoreUpdateDTO.getContactPhone());
             vendorMobileExample.setIsAllowLoginNotEquals(VendorConst.LOGOUT_ALLOW_LOGIN);
+            vendorMobileExample.setVendorIdNotEquals(vendorDB.getVendorId());
             List<Vendor> vendorList = vendorReadMapper.listByExample(vendorMobileExample);
-//            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
+            AssertUtil.isTrue(!CollectionUtils.isEmpty(vendorList), "该手机号已被其他账号绑定，请重新填写");
             //不重复，修改管理员手机号
             vendorDB.setVendorMobile(ownStoreUpdateDTO.getContactPhone());
             vendorWriteMapper.updateByPrimaryKeySelective(vendorDB);
@@ -649,7 +703,7 @@ public class StoreModel {
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Integer editStoreInfo(StoreUpdateDTO storeUpdateDTO) {
+    public Integer editStoreInfo(HttpServletRequest request,StoreUpdateDTO storeUpdateDTO) {
         //根据storeId查询store表
         Store storeDB = storeReadMapper.getByPrimaryKey(storeUpdateDTO.getStoreId());
         if (storeDB == null) {
@@ -724,6 +778,40 @@ public class StoreModel {
             throw new MallException("更新店铺表失败,请重试");
         }
 
+        if (!CollectionUtils.isEmpty(storeUpdateDTO.getStoreBusinessVOList())) {
+            for (StoreBusinessVO storeBusinessVO : storeUpdateDTO.getStoreBusinessVOList()) {
+                if (!WebSiteConstant.MEMBER_OVERSEA.equals(storeBusinessVO.getWebSite())) {
+                    //修改store_site_info表
+                    StoreSiteInfo storeSiteInfoUpdate = new StoreSiteInfo();
+                    //店铺等级id
+                    storeSiteInfoUpdate.setStoreGradeId(storeBusinessVO.getStoreGradeId());
+                    //根据storeGradeId获取等级名称
+                    StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(storeUpdateDTO.getStoreGradeId());
+                    storeSiteInfoUpdate.setStoreGradeName(storeGrade.getGradeName());
+
+
+                    //开店时长
+                    storeSiteInfoUpdate.setOpenTime(storeBusinessVO.getOpenTime());
+                    //店铺到期时间
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(storeDB.getCreateTime());
+                    calendar.add(Calendar.YEAR, storeBusinessVO.getOpenTime());
+                    storeSiteInfoUpdate.setStoreExpireTime(calendar.getTime());
+
+                    Admin admin = UserUtil.getUser(request, Admin.class);
+                    storeSiteInfoUpdate.setUpdateId(admin.getAdminId().longValue());
+                    storeSiteInfoUpdate.setUpdateTime(new Date());
+                    StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+                    storeSiteInfoExample.setStoreId(storeUpdateDTO.getStoreId());
+                    storeSiteInfoExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+                    count = storeSiteInfoWriteMapper.updateByExampleSelective(storeSiteInfoUpdate, storeSiteInfoExample);
+                    if (count == 0) {
+                        log.error("根据storeId：" + storeSiteInfoUpdate.getStoreId() + "更新店铺表国内站失败");
+                        throw new MallException("更新店铺表国内站失败,请重试");
+                    }
+                }
+            }
+        }
         //修改store_apply表
         StoreApply storeApplyUpdate = new StoreApply();
         boolean isUpdate = false;

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

@@ -8,6 +8,7 @@ import com.slodon.b2b2c.dao.write.seller.StoreNameWriteMapper;
 import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.pojo.StoreName;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -33,4 +34,9 @@ public class StoreNameModel {
         }
         return storeNameList;
     }
+
+    public StoreName getStoreNameByExample(StoreNameExample example) {
+        List<StoreName> storeNameList = storeNameReadMapper.listByExample(example);
+        return CollectionUtils.isEmpty(storeNameList) ? null : storeNameList.get(0);
+    }
 }

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

@@ -1,17 +1,18 @@
 package com.slodon.b2b2c.model.seller;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.slodon.b2b2c.dao.read.seller.StoreReadMapper;
+import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.dao.read.seller.StoreSiteInfoReadMapper;
 import com.slodon.b2b2c.dao.write.seller.StoreSiteInfoWriteMapper;
-import com.slodon.b2b2c.dao.write.seller.StoreWriteMapper;
 import com.slodon.b2b2c.seller.example.StoreSiteInfoExample;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreSiteInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Component
 @Slf4j
@@ -37,4 +38,20 @@ public class StoreSiteInfoModel {
         example.setStoreId(storeSiteInfo.getStoreId());
         storeSiteInfoWriteMapper.updateByExampleSelective(storeSiteInfo, example);
     }
+
+    public StoreSiteInfo getStoreSiteInfo(StoreSiteInfoExample example) {
+        List<StoreSiteInfo> storeSiteInfoList = storeSiteInfoReadMapper.listByExample(example);
+        return CollectionUtils.isEmpty(storeSiteInfoList) ? null : storeSiteInfoList.get(0);
+    }
+
+    public List<StoreSiteInfo> getStoreSiteInfoList(StoreSiteInfoExample example, PagerInfo pager) {
+        List<StoreSiteInfo> storeSiteInfoList;
+        if (pager != null) {
+            pager.setRowsCount(storeSiteInfoReadMapper.countByExample(example));
+            storeSiteInfoList = storeSiteInfoReadMapper.listPageByExample(example, pager.getStart(), pager.getPageSize());
+        } else {
+            storeSiteInfoList = storeSiteInfoReadMapper.listByExample(example);
+        }
+        return storeSiteInfoList;
+    }
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/cms/ArticleCategoryVO.java

@@ -18,6 +18,9 @@ public class ArticleCategoryVO {
     @ApiModelProperty("分类id")
     private Integer categoryId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 
@@ -38,6 +41,7 @@ public class ArticleCategoryVO {
 
     public ArticleCategoryVO(ArticleCategory articleCategory) {
         categoryId = articleCategory.getCategoryId();
+        webSite = articleCategory.getWebSite();
         categoryName = articleCategory.getCategoryName();
         sort = articleCategory.getSort();
         isShow = articleCategory.getIsShow();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/cms/ArticleVO.java

@@ -22,6 +22,9 @@ public class ArticleVO {
     @ApiModelProperty("文章id")
     private Integer articleId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 
@@ -42,6 +45,7 @@ public class ArticleVO {
 
     public ArticleVO(Article article) {
         articleId = article.getArticleId();
+        webSite = article.getWebSite();
         title = article.getTitle();
         state = article.getState();
         stateValue = getRealStateValue(state);

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/cms/HelpArticleVO.java

@@ -22,6 +22,9 @@ public class HelpArticleVO {
     @ApiModelProperty("文章id")
     private Integer articleId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("分类名称")
     private String categoryName;
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/AdminEnquiryReceiverMailVO.java

@@ -16,6 +16,8 @@ public class AdminEnquiryReceiverMailVO implements Serializable {
     private static final long serialVersionUID = -8426680439937326616L;
     private Long id;
 
+    private String webSite;
+
     private String email;
 
     private String phone;
@@ -30,6 +32,7 @@ public class AdminEnquiryReceiverMailVO implements Serializable {
 
     public AdminEnquiryReceiverMailVO(AdminEnquiryReceiveMailSetting adminEnquiryReceiveMailSetting) {
         id = adminEnquiryReceiveMailSetting.getId();
+        webSite = adminEnquiryReceiveMailSetting.getWebSite();
         email = adminEnquiryReceiveMailSetting.getEmail();
         phone = adminEnquiryReceiveMailSetting.getPhone();
         operateUid = adminEnquiryReceiveMailSetting.getOperateUid();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/OwnStoreDetailVO.java

@@ -23,6 +23,10 @@ public class OwnStoreDetailVO {
     @ApiModelProperty("店铺名称")
     private String storeName;
 
+    @ApiModelProperty("国内店铺名称")
+    private String storeNameCn;
+
+
     @ApiModelProperty("联系人名称")
     private String contactName;
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreApplyDetailVO.java

@@ -4,6 +4,7 @@ import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
 import com.slodon.b2b2c.seller.pojo.StoreName;
@@ -105,6 +106,13 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("店铺等级名称")
     private String storeGradeName;
 
+    @ApiModelProperty("开店时长")
+    private Integer openTime;
+
+    @ApiModelProperty("经营信息集合")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
+
     @ApiModelProperty("拒绝理由")
     private String refuseReason;
 
@@ -117,6 +125,7 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("经营类目集合")
     private List<StoreGoodsCateVO> storeGoodsCateVOList;
 
+
     public StoreApplyDetailVO(StoreApply storeApply, StoreCertificate storeCertificate) {
         storeName = storeApply.getStoreName();
         storeGradeId = storeApply.getStoreGradeId();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreDetailVO.java

@@ -4,6 +4,7 @@ import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,6 +30,9 @@ public class StoreDetailVO {
     @ApiModelProperty("店铺名称")
     private String storeName;
 
+    @ApiModelProperty("店铺经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
     @ApiModelProperty("店铺Logo")
     private String storeLogo;
 
@@ -74,6 +78,10 @@ public class StoreDetailVO {
     @ApiModelProperty("身份证背面扫描件绝对地址")
     private String personCardDownPath;
 
+    @ApiModelProperty("店铺等级集合")
+    private List<StoreGradeVO> storeGradeVOList;
+
+
     @ApiModelProperty("店铺等级id")
     private Integer storeGradeId;
 
@@ -82,6 +90,16 @@ public class StoreDetailVO {
 
     @ApiModelProperty("店铺等级名称")
     private String storeGradeName;
+//
+//
+//    @ApiModelProperty("国内店铺等级id")
+//    private Integer storeGradeIdCn;
+//
+//    @ApiModelProperty("国内开店时长")
+//    private Integer openTimeCn;
+//
+//    @ApiModelProperty("国内店铺等级名称")
+//    private String storeGradeNameCn;
 
     @ApiModelProperty("应付金额")
     private BigDecimal payAmount;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreGradeVO.java

@@ -15,6 +15,9 @@ public class StoreGradeVO {
     @ApiModelProperty("等级ID")
     private Integer gradeId;
 
+    @ApiModelProperty("站点")
+    private String webSite;
+
     @ApiModelProperty("等级名称")
     private String gradeName;
 
@@ -35,6 +38,7 @@ public class StoreGradeVO {
 
     public StoreGradeVO(StoreGrade storeGrade) {
         gradeId = storeGrade.getGradeId();
+        webSite = storeGrade.getWebSite();
         gradeName = storeGrade.getGradeName();
         goodsLimit = storeGrade.getGoodsLimit();
         price = storeGrade.getPrice();

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/cms/ArticleCategoryReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.cms.ArticleCategoryReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.cms.pojo.ArticleCategory">
     <id column="category_id" property="categoryId" />
+    <result column="web_site" property="webSite" />
     <result column="category_name" property="categoryName" />
     <result column="sort" property="sort" />
     <result column="is_show" property="isShow" />
@@ -24,6 +25,9 @@
         <if test="example.categoryIdIn != null">
           AND `category_id` in (${example.categoryIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryName != null">
           AND `category_name` = #{example.categoryName}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/cms/ArticleReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.cms.ArticleReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.cms.pojo.Article">
     <id column="article_id" property="articleId" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="title" property="title" />
     <result column="out_url" property="outUrl" />
@@ -27,6 +28,9 @@
         <if test="example.articleIdIn != null">
           AND `article_id` in (${example.articleIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/cms/helpArticleReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.cms.HelpArticleReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreCmsArticle">
     <id column="article_id" property="articleId" />
+    <id column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="title" property="title" />
     <result column="out_url" property="outUrl" />
@@ -27,6 +28,9 @@
         <if test="example.articleIdIn != null">
           AND `article_id` in (${example.articleIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberEnquiryReadMapper.xml

@@ -260,6 +260,9 @@
         <if test="storeId != null">
             AND t1.`store_id` = #{storeId}
         </if>
+        <if test="webSite != null">
+            AND t1.`web_site` = #{webSite}
+        </if>
         order by t1.id desc
     </select>
 
@@ -282,6 +285,9 @@
         <if test="storeId != null">
             AND t1.`store_id` = #{storeId}
         </if>
+        <if test="webSite != null">
+            AND t1.`web_site` = #{webSite}
+        </if>
         order by t1.id desc
         <include refid="limit"/>
     </select>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/StoreGradeReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.seller.StoreGradeReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreGrade">
     <id column="grade_id" property="gradeId" />
+    <result column="web_site" property="webSite" />
     <result column="grade_name" property="gradeName" />
     <result column="goods_limit" property="goodsLimit" />
     <result column="recommend_limit" property="recommendLimit" />
@@ -25,6 +26,9 @@
         <if test="example.gradeIdIn != null">
           AND `grade_id` in (${example.gradeIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.gradeName != null">
           AND `grade_name` = #{example.gradeName}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/StoreNameReadMapper.xml

@@ -28,6 +28,9 @@
         <if test="example.storeName != null">
           AND `store_name` = #{example.storeName}
         </if>
+        <if test="example.storeNameLike != null">
+          AND `store_name` like concat('%',#{example.storeNameLike},'%')
+        </if>
         <if test="example.webSite != null">
           AND `web_site` = #{example.webSite}
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/seller/StoreSiteInfoReadMapper.xml

@@ -13,6 +13,10 @@
     <result column="address" property="address" />
     <result column="store_map_info" property="storeMapInfo" />
     <result column="store_map_info_w" property="storeMapInfoW" />
+    <result column="store_grade_id" property="storeGradeId" />
+    <result column="store_grade_name" property="storeGradeName" />
+    <result column="open_time" property="openTime" />
+    <result column="store_expire_time" property="storeExpireTime" />
     <result column="create_id" property="createId" />
     <result column="create_time" property="createTime" />
     <result column="update_id" property="updateId" />
@@ -32,6 +36,9 @@
         <if test="example.webSite != null">
           AND `web_site` = #{example.webSite}
         </if>
+        <if test="example.storeGradeId != null">
+          AND `store_grade_id` = #{example.storeGradeId}
+        </if>
       </trim>
     </if>
   </sql>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/system/AdminEnquiryReceiveMailSettingReadMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.read.system.AdminEnquiryReceiveMailSettingReadMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.system.pojo.AdminEnquiryReceiveMailSetting">
     <id column="id" property="id" />
+    <result column="web_site" property="webSite" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
     <result column="operate_uid" property="operateUid" />
@@ -32,6 +33,9 @@
         <if test="example.idNotEqualTo != null">
           AND `id` != #{example.idNotEqualTo}
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
       </trim>
     </if>
   </sql>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/cms/ArticleCategoryWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.cms.ArticleCategoryWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.cms.pojo.ArticleCategory">
     <id column="category_id" property="categoryId" />
+    <result column="web_site" property="webSite" />
     <result column="category_name" property="categoryName" />
     <result column="sort" property="sort" />
     <result column="is_show" property="isShow" />
@@ -13,6 +14,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryName != null">
         `category_name`,
       </if>
@@ -47,6 +51,9 @@
         <if test="example.categoryIdIn != null">
           AND `category_id` in (${example.categoryIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryName != null">
           AND `category_name` = #{example.categoryName}
         </if>
@@ -199,6 +206,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryName != null">
         #{categoryName},
       </if>
@@ -224,6 +234,9 @@
   <update id="updateByExampleSelective">
     UPDATE `cms_article_category`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryName != null">
         `category_name` = #{record.categoryName},
       </if>
@@ -249,6 +262,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `cms_article_category`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryName != null">
         `category_name` = #{categoryName},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/cms/ArticleWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.cms.ArticleWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.cms.pojo.Article">
     <id column="article_id" property="articleId" />
+    <result column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="title" property="title" />
     <result column="out_url" property="outUrl" />
@@ -16,6 +17,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        web_site,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -59,6 +63,9 @@
         <if test="example.articleIdIn != null">
           AND `article_id` in (${example.articleIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -223,6 +230,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -257,6 +267,9 @@
   <update id="updateByExampleSelective">
     UPDATE `cms_article`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -291,6 +304,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `cms_article`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/cms/HelpArticleWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.cms.HelpArticleWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreCmsArticle">
     <id column="article_id" property="articleId" />
+    <id column="web_site" property="webSite" />
     <result column="category_id" property="categoryId" />
     <result column="title" property="title" />
     <result column="out_url" property="outUrl" />
@@ -16,6 +17,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="categoryId != null">
         `category_id`,
       </if>
@@ -59,6 +63,9 @@
         <if test="example.articleIdIn != null">
           AND `article_id` in (${example.articleIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.categoryId != null">
           AND `category_id` = #{example.categoryId}
         </if>
@@ -223,6 +230,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="categoryId != null">
         #{categoryId},
       </if>
@@ -257,6 +267,9 @@
   <update id="updateByExampleSelective">
     UPDATE `store_cms_article`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.categoryId != null">
         `category_id` = #{record.categoryId},
       </if>
@@ -291,6 +304,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `store_cms_article`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="categoryId != null">
         `category_id` = #{categoryId},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/seller/StoreGradeWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.seller.StoreGradeWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.seller.pojo.StoreGrade">
     <id column="grade_id" property="gradeId" />
+    <result column="web_site" property="webSite" />
     <result column="grade_name" property="gradeName" />
     <result column="goods_limit" property="goodsLimit" />
     <result column="recommend_limit" property="recommendLimit" />
@@ -14,6 +15,9 @@
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site`,
+      </if>
       <if test="gradeName != null">
         `grade_name`,
       </if>
@@ -51,6 +55,9 @@
         <if test="example.gradeIdIn != null">
           AND `grade_id` in (${example.gradeIdIn})
         </if>
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
+        </if>
         <if test="example.gradeName != null">
           AND `grade_name` = #{example.gradeName}
         </if>
@@ -200,6 +207,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="gradeName != null">
         #{gradeName},
       </if>
@@ -228,6 +238,9 @@
   <update id="updateByExampleSelective">
     UPDATE `store_grade`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.gradeName != null">
         `grade_name` = #{record.gradeName},
       </if>
@@ -256,6 +269,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `store_grade`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="gradeName != null">
         `grade_name` = #{gradeName},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/seller/StoreSiteInfoWriteMapper.xml

@@ -13,6 +13,10 @@
     <result column="address" property="address" />
     <result column="store_map_info" property="storeMapInfo" />
     <result column="store_map_info_w" property="storeMapInfoW" />
+    <result column="store_grade_id" property="storeGradeId" />
+    <result column="store_grade_name" property="storeGradeName" />
+    <result column="open_time" property="openTime" />
+    <result column="store_expire_time" property="storeExpireTime" />
     <result column="create_id" property="createId" />
     <result column="create_time" property="createTime" />
     <result column="update_id" property="updateId" />
@@ -51,6 +55,18 @@
       <if test="storeMapInfoW != null">
         `store_map_info_w`,
       </if>
+      <if test="storeGradeId != null">
+        `store_grade_id`,
+      </if>
+      <if test="storeGradeName != null">
+        `store_grade_name`,
+      </if>
+      <if test="openTime != null">
+        `open_time`,
+      </if>
+      <if test="storeExpireTime != null">
+        `store_expire_time`,
+      </if>
       <if test="createId != null">
         `create_id`,
       </if>
@@ -235,6 +251,18 @@
       <if test="storeMapInfoW != null">
         #{storeMapInfoW},
       </if>
+      <if test="storeGradeId != null">
+        #{storeGradeId},
+      </if>
+      <if test="storeGradeName != null">
+        #{storeGradeName},
+      </if>
+      <if test="openTime != null">
+        #{openTime},
+      </if>
+      <if test="storeExpireTime != null">
+        #{storeExpireTime},
+      </if>
       <if test="createId != null">
         #{createId},
       </if>
@@ -278,6 +306,18 @@
       <if test="record.storeMapInfoW != null">
           `store_map_info_w` = #{record.storeMapInfoW},
       </if>
+      <if test="record.storeGradeId != null">
+        `store_grade_id` = #{record.storeGradeId},
+      </if>
+      <if test="record.storeGradeName != null">
+        `store_grade_name` = #{record.storeGradeName},
+      </if>
+      <if test="record.openTime != null">
+        `open_time` = #{record.openTime},
+      </if>
+      <if test="record.storeExpireTime != null">
+        `store_expire_time` = #{record.storeExpireTime},
+      </if>
         <if test="record.updateId != null">
           `update_id` = #{record.updateId},
         </if>
@@ -316,6 +356,18 @@
       <if test="storeMapInfoW != null">
         `store_map_info_w` = #{storeMapInfoW},
       </if>
+      <if test="storeGradeId != null">
+        `store_grade_id` = #{storeGradeId},
+      </if>
+      <if test="storeGradeName != null">
+        `store_grade_name` = #{storeGradeName},
+      </if>
+      <if test="openTime != null">
+        `open_time` = #{openTime},
+      </if>
+      <if test="storeExpireTime != null">
+        `store_expire_time` = #{storeExpireTime},
+      </if>
       <if test="updateId != null">
         `update_id` = #{updateId},
       </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/system/AdminEnquiryReceiveMailSettingWriteMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.slodon.b2b2c.dao.write.system.AdminEnquiryReceiveMailSettingWriteMapper">
   <resultMap id="resultMap" type="com.slodon.b2b2c.system.pojo.AdminEnquiryReceiveMailSetting">
     <id column="id" property="id" />
+    <result column="web_site" property="webSite" />
     <result column="email" property="email" />
     <result column="phone" property="phone" />
     <result column="operate_uid" property="operateUid" />
@@ -27,6 +28,9 @@
       <if test="createTime != null">
         `create_time`,
       </if>
+      <if test="example.webSite != null">
+        AND `web_site` = #{example.webSite}
+      </if>
     </trim>
   </sql>
   <!--按照主键值进行操作-->
@@ -163,6 +167,9 @@
     )
     VALUES(
     <trim suffixOverrides=",">
+      <if test="webSite != null">
+        #{webSite},
+      </if>
       <if test="email != null">
         #{email},
       </if>
@@ -185,6 +192,9 @@
   <update id="updateByExampleSelective">
     UPDATE `sys_enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="record.webSite != null">
+        `web_site` = #{record.webSite},
+      </if>
       <if test="record.email != null">
         `email` = #{record.email},
       </if>
@@ -207,6 +217,9 @@
   <update id="updateByPrimaryKeySelective">
     UPDATE `sys_enquiry_receive_mail_setting`
     <trim prefix="SET" suffixOverrides=",">
+      <if test="webSite != null">
+        `web_site` = #{webSite},
+      </if>
       <if test="email != null">
         `email` = #{email},
       </if>

xinkeaboard-server/doc/DDL/update.sql

@@ -243,6 +243,31 @@ ALTER TABLE goods_category ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMEN
 ALTER TABLE goods_attribute ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER attribute_id;
 
 
+INSERT INTO store_name(web_site, store_id, store_name, store_log, create_id, create_time)
+SELECT '2', store_id, store_name, store_logo, 0, SYSDATE()
+FROM store;
+
+ALTER TABLE store_site_info
+ADD COLUMN store_grade_id INT NULL  COMMENT '店铺等级id',
+ADD COLUMN store_grade_name VARCHAR(255) NULL COMMENT '店铺等级名称',
+ADD COLUMN open_time TINYINT  NULL  COMMENT '开店时长，1、2、3、4，单位：年',
+ADD COLUMN store_expire_time  DATETIME   NULL  COMMENT '店铺到期时间';
+
+
+ALTER TABLE store_grade ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER grade_id;
+
+ALTER TABLE sys_enquiry_receive_mail_setting ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER id;
+
+ALTER TABLE cms_article_category ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER category_id;
+
+ALTER TABLE cms_article ADD COLUMN web_site TINYINT NOT NULL DEFAULT 1 COMMENT '站点 1:海外门户 2:国内分销门户' AFTER article_id;
+
+INSERT INTO store_cms_article_category
+VALUES(null, "国外站门户", 4, 1, 1, now(), now(), null),(null, "国内站门户", 5, 1, 1, now(), now(), null);
+
+UPDATE store_cms_article_category SET is_show = 0 WHERE category_name='PC商城';
+
+