fix: 切换经营状态增加装修开关判断

xinkeaboard-server/b2b2c-core/src/main/java/com/slodon/b2b2c/core/response/SldResponse.java

@@ -57,6 +57,14 @@ public class SldResponse {
         jsonResult.setData(data);
         return jsonResult;
     }
+    public static <T> JsonResult<T> success(String msg, String logMsg, T data) {
+        JsonResult<T> jsonResult = new JsonResult<>();
+        jsonResult.setState(ResponseConst.STATE_SUCCESS);
+        jsonResult.setMsg(msg);
+        jsonResult.setLogMsg(logMsg);
+        jsonResult.setData(data);
+        return jsonResult;
+    }
 
     public static <T> JsonResult<T> success(T data, String logMsg) {
         JsonResult<T> jsonResult = new JsonResult<>();

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

@@ -117,8 +117,8 @@ public class HttpClientUtil {
 
         // 设置最大请求和传输超时时间
         RequestConfig requestConfig = RequestConfig.custom()
-                .setSocketTimeout(50000)
-                .setConnectTimeout(50000)
+                .setSocketTimeout(1000*100)
+                .setConnectTimeout(1000*100)
                 .build();
         httpPost.setConfig(requestConfig);
 

xinkeaboard-server/b2b2c-investment/src/main/java/com/slodon/b2b2c/investment/controller/AnalysisController.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.investment.controller;
 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.StringUtil;
 import com.slodon.b2b2c.investment.bean.analysis.dto.*;
 import com.slodon.b2b2c.investment.bean.analysis.vo.KeyWordPartVO;
 import com.slodon.b2b2c.investment.bean.analysis.vo.RivalPartVO;
@@ -128,10 +129,12 @@ public class AnalysisController {
      */
     @PostMapping("/record")
     public JsonResult<Integer> record(@Valid @RequestBody CompanyDTO dto) {
-        String verifySms = stringRedisTemplate.opsForValue().get(dto.getPhone());
-        AssertUtil.isTrue(!dto.getVerifyCode().equals(verifySms), "验证码输入错误，请重试");
         int id;
         try {
+            String verifySms = stringRedisTemplate.opsForValue().get(dto.getPhone());
+            AssertUtil.isTrue(StringUtil.isEmpty(verifySms), "请先获取验证码");
+            AssertUtil.isTrue(!dto.getVerifyCode().equals(verifySms), "验证码输入错误，请重试");
+            stringRedisTemplate.delete(dto.getPhone()); //删除验证码
             id = analysisModel.record(dto);
         } catch (Exception e) {
             log.error(e.getMessage(),e);

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

@@ -5,10 +5,13 @@ import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.controller.BaseController;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.JsonResult;
+import com.slodon.b2b2c.core.response.PagerInfo;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
+import com.slodon.b2b2c.core.util.WebUtil;
+import com.slodon.b2b2c.dao.read.system.TplPcMallDecoReadMapper;
 import com.slodon.b2b2c.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
@@ -17,8 +20,10 @@ import com.slodon.b2b2c.model.seller.*;
 import com.slodon.b2b2c.model.system.SettingModel;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
+import com.slodon.b2b2c.system.example.TplPcMallDecoExample;
 import com.slodon.b2b2c.system.pojo.Setting;
 import com.slodon.b2b2c.system.pojo.SysSeo;
+import com.slodon.b2b2c.system.pojo.TplPcMallDeco;
 import com.slodon.b2b2c.vo.seller.StoreDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
 import com.slodon.b2b2c.vo.seller.StoreIndexInformationVO;
@@ -69,6 +74,8 @@ public class SellerStoreController extends BaseController {
     private GoodsCategoryModel goodsCategoryModel;
     @Resource
     private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private TplPcMallDecoReadMapper tplPcMallDecoReadMapper;
 
     @Resource
     private StoreProfileTextListModel storeProfileTextListModel;
@@ -281,11 +288,23 @@ public class SellerStoreController extends BaseController {
     })
     @VendorLogger(option = "编辑店铺经营状态接口")
     @PostMapping("updateBusinessState")
-    public JsonResult<Integer> updateStoreBusinessState(HttpServletRequest request,
+    public JsonResult<Boolean> updateStoreBusinessState(HttpServletRequest request,
                                                         @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite,
                                                         @RequestParam(value = "businessState") Integer businessState) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 
+        boolean deco = false;
+        if (businessState == 3) {
+            TplPcMallDecoExample example = new TplPcMallDecoExample();
+            example.setWebSite(webSite);
+            example.setIsEnable(1);
+            example.setStoreId(vendor.getStoreId());
+            int i = tplPcMallDecoReadMapper.countByExample(example);
+            if(i==0){
+                deco = true;
+            }
+        }
+
         String logMsg = "店铺id:" + vendor.getStoreId();
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             Store store = new Store();
@@ -312,7 +331,8 @@ public class SellerStoreController extends BaseController {
                 storeSiteInfoModel.updateStoreSiteInfo(storeSiteInfo);
             }
         }
-        return SldResponse.success("设置成功", logMsg);
+
+        return SldResponse.success("设置成功", logMsg, deco);
     }
 
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/goods/ProductModel.java

@@ -228,7 +228,7 @@ public class ProductModel {
 
         //目前只有单规格
         param.set("productId", products.get(0).getProductId().toString());
-        param.set("authName", vendor.getVendorName());
+        param.set("authName", vendor.getVendorName()+"_"+vendor.getStoreId());
         param.set("name", goods.getGoodsName());
         param.set("cn_name", goods.getGoodsNameCn());
         param.set("sku", goods.getGoodsId().toString());

xinkeaboard-server/doc/DDL/update.sql

@@ -402,7 +402,7 @@ CREATE TABLE `business_analysis_record` (
                                             PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='商情分析记录';
 
-
+UPDATE `sys_reason` SET `is_show` = 0 WHERE `reason_id` = 3;