帮助/协议区分站点+接口调整

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

@@ -47,8 +47,8 @@ public class AdminDocHelpController {
      * @return
      */
     @GetMapping("/admin/list")
-    public JsonResult<PageVO<HelpArticleVO>> getAdminDocList(HttpServletRequest request,String searchWord) {
-        return getHelpDocList(request, ArticleConst.ADMIN_CATEGORY,searchWord);
+    public JsonResult<PageVO<HelpArticleVO>> getAdminDocList(HttpServletRequest request, String searchWord, String webSite) {
+        return getHelpDocList(request, ArticleConst.ADMIN_CATEGORY, searchWord,webSite);
     }
 
     /**
@@ -58,8 +58,8 @@ public class AdminDocHelpController {
      * @return
      */
     @GetMapping("/seller/list")
-    public JsonResult<PageVO<HelpArticleVO>> getSellerDocList(HttpServletRequest request,String searchWord) {
-        return getHelpDocList(request, ArticleConst.SELLER_CATEGORY,searchWord);
+    public JsonResult<PageVO<HelpArticleVO>> getSellerDocList(HttpServletRequest request, String searchWord, String webSite) {
+        return getHelpDocList(request, ArticleConst.SELLER_CATEGORY, searchWord, webSite);
     }
 
     /**
@@ -67,12 +67,13 @@ public class AdminDocHelpController {
      * @param categoryId
      * @return
      */
-    private JsonResult<PageVO<HelpArticleVO>> getHelpDocList(HttpServletRequest request, Integer categoryId,String searchWord) {
+    private JsonResult<PageVO<HelpArticleVO>> getHelpDocList(HttpServletRequest request, Integer categoryId,String searchWord,String webSite) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         HelpArticleExample example = new HelpArticleExample();
         example.setCategoryId(categoryId);
         example.setState(ArticleConst.STATE_YES);
         example.setSearchWord(searchWord);
+        example.setWebSite(webSite);
         List<StoreCmsArticle> list = helpArticleModel.getArticleList(example, null);
         List<HelpArticleVO> vos = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/statistics/screen/ScreenAnalysisController.java

@@ -270,7 +270,7 @@ public class ScreenAnalysisController extends BaseController {
      * @param request
      * @return
      */
-    @GetMapping("data/summary")
+    @GetMapping("dataSummary")
     @ApiOperation("平台数据汇总")
     public JsonResult<ScreenDataSummary> getDataSummary(HttpServletRequest request) {
         ScreenDataSummary vo = new ScreenDataSummary();

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

@@ -5,6 +5,8 @@ import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
+import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.model.system.AgreementModel;
 import com.slodon.b2b2c.system.pojo.Agreement;
 import com.slodon.b2b2c.vo.business.AgreementDetailVO;
@@ -34,7 +36,11 @@ public class FrontAgreementController extends BaseController {
     @GetMapping("detail")
     public JsonResult<AgreementDetailVO> detail(HttpServletRequest request, String agreementCode) {
         AssertUtil.notEmpty(agreementCode, "协议编码不能为空");
+        String webSite = WebUtil. getWebSite(request);
         Agreement agreement = agreementModel.getAgreementByAgreementCode(agreementCode);
+        if (!WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
+            agreement = agreementModel.getAgreementByAgreementCode(agreementCode + "_" + webSite);
+        }
         AssertUtil.notNull(agreement, "查询的协议信息为空");
         AgreementDetailVO vo = new AgreementDetailVO(agreement);
         return SldResponse.success(vo);

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

@@ -483,6 +483,11 @@ public class StoreModel {
             throw new MallException("删除店铺表失败,请重试");
         }
 
+        //删除店铺其他站点名称
+        StoreNameExample storeNameExample =new StoreNameExample();
+        storeNameExample.setStoreId(storeId);
+        storeNameWriteMapper.deleteByExample(storeNameExample);
+
         //查询店铺下的商户账号
         VendorExample vendorExample = new VendorExample();
         vendorExample.setStoreId(storeId);