修改问题

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/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 = "已拒绝";