fix: 全局样式调整

xinkeaboard-server/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/HttpClientUtil.java

@@ -1,8 +1,7 @@
 package com.slodon.b2b2c.core.util;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.http.HttpRequest;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
@@ -15,6 +14,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.content.FileBody;
+import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicNameValuePair;
@@ -27,10 +28,11 @@ import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+
 /**
  * http请求工具类
  */
-@Slf4j
 public class HttpClientUtil {
 
     /**
@@ -186,9 +188,8 @@ public class HttpClientUtil {
             StringEntity stringEntity = new StringEntity(params, StandardCharsets.UTF_8);
             httpPost.setEntity(stringEntity);
         }
-        log.info("httpPost201 request:{}", JSONObject.toJSONString(httpPost));
+
         CloseableHttpResponse response = httpClient.execute(httpPost);
-        log.info("httpPost201 response:{}", JSONObject.toJSONString(response));
 
         try {
             if (response.getStatusLine().getStatusCode() == HttpStatus.SC_CREATED) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/goods/front/FrontGoodsCategoryController.java

@@ -78,6 +78,7 @@ public class FrontGoodsCategoryController extends BaseController {
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = jsonArray.getJSONObject(i);
                 FrontGoodsCategoryVO vo = new FrontGoodsCategoryVO();
+                vo.setWebSite(jsonObject.getString("webSite"));
                 vo.setCategoryId(jsonObject.getInteger("categoryId"));
                 vo.setCategoryName(jsonObject.getString("categoryName"));
                 vo.setPid(jsonObject.getInteger("pid"));

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

@@ -83,7 +83,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryValidExample.setItemTypeIn(itemTypeStr);
-        memberEnquiryNewExample.setWebSite(webSite);
+        memberEnquiryValidExample.setWebSite(webSite);
         enquiryOverviewVO.setValidInquiryNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryValidExample));
 
         //待分配询盘数
@@ -91,7 +91,7 @@ public class SellerEnquiryAnalysisController extends BaseController {
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
-        memberEnquiryNewExample.setWebSite(webSite);
+        memberEnquiryToAssignExample.setWebSite(webSite);
         enquiryOverviewVO.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
         return SldResponse.success(enquiryOverviewVO);

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

@@ -113,17 +113,18 @@ public class SellerOverviewController extends BaseController {
         //违规商品数
         GoodsExample goodsExample = new GoodsExample();
         goodsExample.setStoreId(vendor.getStoreId());
+        goodsExample.setWebSite(webSite);
         goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
         goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
         sellerWaitDeal.setSysLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
 
-        //站点违规商品数
-        goodsExample = new GoodsExample();
-        goodsExample.setWebSite(webSite);
-        goodsExample.setStoreId(vendor.getStoreId());
-        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
-        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
-        sellerWaitDeal.setSysWebSiteLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
+//        //站点违规商品数
+//        goodsExample = new GoodsExample();
+//        goodsExample.setWebSite(webSite);
+//        goodsExample.setStoreId(vendor.getStoreId());
+//        goodsExample.setState(GoodsConst.GOODS_STATE_LOWER_BY_SYSTEM);
+//        goodsExample.setIsDelete(GoodsConst.GOODS_IS_DELETE_NO);
+//        sellerWaitDeal.setSysWebSiteLowerGoodsNum(goodsModel.getGoodsCount(goodsExample));
 
         //待确认结算单数
         BillExample billExample = new BillExample();
@@ -139,6 +140,7 @@ public class SellerOverviewController extends BaseController {
 
         //询盘总数
         MemberEnquiryExample memberEnquiryTotalExample = new MemberEnquiryExample();
+        memberEnquiryTotalExample.setWebSite(webSite);
         memberEnquiryTotalExample.setStoreId(vendor.getStoreId());
         memberEnquiryTotalExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
         memberEnquiryTotalExample.setItemTypeIn(itemTypeStr);
@@ -148,6 +150,7 @@ public class SellerOverviewController extends BaseController {
         Date enquiryEndTime = new Date();
         DateTime enquiryStartTime = DateUtil.beginOfDay(enquiryEndTime);
         MemberEnquiryExample memberEnquiryNewExample = new MemberEnquiryExample();
+        memberEnquiryNewExample.setWebSite(webSite);
         memberEnquiryNewExample.setStoreId(vendor.getStoreId());
         memberEnquiryNewExample.setCreateTimeGte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryStartTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
         memberEnquiryNewExample.setCreateTimeLte(com.slodon.b2b2c.core.util.DateUtil.dateToString(enquiryEndTime, com.slodon.b2b2c.core.util.DateUtil.DATE_FORMAT_FIVE));
@@ -157,6 +160,7 @@ public class SellerOverviewController extends BaseController {
 
         //有效询盘数
         MemberEnquiryExample memberEnquiryValidExample = new MemberEnquiryExample();
+        memberEnquiryValidExample.setWebSite(webSite);
         memberEnquiryValidExample.setStoreId(vendor.getStoreId());
         memberEnquiryValidExample.setValidStatus(EnquiryConst.ENQUIRY_VALID);
         memberEnquiryValidExample.setStatusNotEqual(EnquiryConst.ENQUIRY_DELETE);
@@ -165,18 +169,19 @@ public class SellerOverviewController extends BaseController {
 
         //待分配询盘数
         MemberEnquiryExample memberEnquiryToAssignExample = new MemberEnquiryExample();
+        memberEnquiryToAssignExample.setWebSite(webSite);
         memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
         memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
         memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
         sellerWaitDeal.setEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
-        //站点待分配询盘数
-        memberEnquiryToAssignExample = new MemberEnquiryExample();
-        memberEnquiryToAssignExample.setWebSite(webSite);
-        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
-        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
-        memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
-        sellerWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
+//        //站点待分配询盘数
+//        memberEnquiryToAssignExample = new MemberEnquiryExample();
+//        memberEnquiryToAssignExample.setWebSite(webSite);
+//        memberEnquiryToAssignExample.setStoreId(vendor.getStoreId());
+//        memberEnquiryToAssignExample.setStatusEqual(EnquiryConst.ENQUIRY_NEW);
+//        memberEnquiryToAssignExample.setItemTypeIn(itemTypeStr);
+//        sellerWaitDeal.setWebSiteEnquiryToBeAssignNum(memberEnquiryModel.getMemberEnquiryCount(memberEnquiryToAssignExample));
 
         result.setSellerWaitDeal(sellerWaitDeal);
 

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

@@ -444,6 +444,7 @@ public class StoreModel {
         try {
             result = HttpClientUtil.httpPost201(storeConfig.getUrl(), param.toString(), headers);
         } catch (Exception e) {
+            log.error("调用第三方接口获取店铺URL失败 -请求接口: {}, 请求参数: {},请求头: {}, 错误信息: {}", storeConfig.getUrl(), param.toString(), com.alibaba.fastjson.JSONObject.toJSONString(headers), e.getMessage(), e);
             throw new MallException("获取店铺url信息表失败，请重试");
         }
         JSONObject jsonObject = JSONUtil.parseObj(result);

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

@@ -79,7 +79,7 @@ public class StoreApplyVO {
                 value = "待审核";
                 break;
             case StoreConst.STATE_2_DONE_APPLY:
-                value = "待付款";
+                value = "待审核";
                 break;
             case StoreConst.STATE_3_FAIL_APPLY:
                 value = "已拒绝";

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/statistics/SellerPresentIndexVO.java

@@ -37,8 +37,8 @@ public class SellerPresentIndexVO {
         @ApiModelProperty("违规商品数")
         private Integer sysLowerGoodsNum;
 
-        @ApiModelProperty("站点违规商品数")
-        private Integer sysWebSiteLowerGoodsNum;
+//        @ApiModelProperty("站点违规商品数")
+//        private Integer sysWebSiteLowerGoodsNum;
 
         @ApiModelProperty("待确认结算单数")
         private Integer confirmBillNum;
@@ -55,8 +55,8 @@ public class SellerPresentIndexVO {
         @ApiModelProperty("待分配询盘数")
         private Integer enquiryToBeAssignNum;
 
-        @ApiModelProperty("站点待分配询盘数")
-        private Integer webSiteEnquiryToBeAssignNum;
+//        @ApiModelProperty("站点待分配询盘数")
+//        private Integer webSiteEnquiryToBeAssignNum;
     }
 
 }

xinkeaboard-server/b2b2c-web/src/main/resources/application-prod.yml

@@ -53,3 +53,23 @@ geoip:
   static:
     city:
       mmdb: /data/GeoLite2/GeoLite2-City.mmdb
+
+#dataforseo外部接口
+analysis:
+  translateAddress: http://54.46.9.88:8007
+  loginUser: metaljacket@meshinfo.cn
+  password: d088821c1d6863ec
+  searchVolume: https://api.dataforseo.com/v3/keywords_data/google/search_volume/live
+  keywordsForSite: https://api.dataforseo.com/v3/keywords_data/google_ads/keywords_for_site/live
+  KeywordForSuggestions: https://api.dataforseo.com/v3/dataforseo_labs/google/keyword_suggestions/live
+  rankedKeywords: https://api.dataforseo.com/v3/dataforseo_labs/google/ranked_keywords/live
+  historicalTraffic: https://api.dataforseo.com/v3/dataforseo_labs/google/historical_bulk_traffic_estimation/live
+  modelName: gemini-2.5-flash
+#dify
+dify:
+  apiKey: dataset-t2bq146uJwJj00kxVyfOOWua
+  difyRoute: http://52.42.176.27/v1/datasets/
+
+store:
+  url: https://xinke.sutextech.com/api/get_store_urls/
+  token: Token 7858e42dcc68d1bb090438a0baab69b085f4b57e

xinkeaboard-server/b2b2c-web/src/main/resources/application-test.yml

@@ -53,3 +53,23 @@ geoip:
   static:
     city:
       mmdb: /data/GeoLite2/GeoLite2-City.mmdb
+
+#dataforseo外部接口
+analysis:
+  translateAddress: http://54.46.9.88:8007
+  loginUser: metaljacket@meshinfo.cn
+  password: d088821c1d6863ec
+  searchVolume: https://api.dataforseo.com/v3/keywords_data/google/search_volume/live
+  keywordsForSite: https://api.dataforseo.com/v3/keywords_data/google_ads/keywords_for_site/live
+  KeywordForSuggestions: https://api.dataforseo.com/v3/dataforseo_labs/google/keyword_suggestions/live
+  rankedKeywords: https://api.dataforseo.com/v3/dataforseo_labs/google/ranked_keywords/live
+  historicalTraffic: https://api.dataforseo.com/v3/dataforseo_labs/google/historical_bulk_traffic_estimation/live
+  modelName: gemini-2.5-flash
+#dify
+dify:
+  apiKey: dataset-t2bq146uJwJj00kxVyfOOWua
+  difyRoute: http://52.42.176.27/v1/datasets/
+
+store:
+  url: https://xinke.sutextech.com/api/get_store_urls/
+  token: Token 7858e42dcc68d1bb090438a0baab69b085f4b57e