Browse Source

fix: 经营中未装修增加提示

Signed-off-by: sunshihao <sunshihaoemail>
sunshihao 2 days ago
parent
commit
f46f626fb0

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

@@ -57,6 +57,14 @@ public class SldResponse {
         jsonResult.setData(data);
         jsonResult.setData(data);
         return jsonResult;
         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) {
     public static <T> JsonResult<T> success(T data, String logMsg) {
         JsonResult<T> jsonResult = new JsonResult<>();
         JsonResult<T> jsonResult = new JsonResult<>();

+ 22 - 2
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.controller.BaseController;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.JsonResult;
 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.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.AssertUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
 import com.slodon.b2b2c.core.util.UserUtil;
 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.enums.WebSiteConstant;
 import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.example.GoodsCategoryExample;
 import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 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.model.system.SettingModel;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 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.Setting;
 import com.slodon.b2b2c.system.pojo.SysSeo;
 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.StoreDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
 import com.slodon.b2b2c.vo.seller.StoreIndexInformationVO;
 import com.slodon.b2b2c.vo.seller.StoreIndexInformationVO;
@@ -69,6 +74,8 @@ public class SellerStoreController extends BaseController {
     private GoodsCategoryModel goodsCategoryModel;
     private GoodsCategoryModel goodsCategoryModel;
     @Resource
     @Resource
     private StringRedisTemplate stringRedisTemplate;
     private StringRedisTemplate stringRedisTemplate;
+    @Resource
+    private TplPcMallDecoReadMapper tplPcMallDecoReadMapper;
 
 
     @Resource
     @Resource
     private StoreProfileTextListModel storeProfileTextListModel;
     private StoreProfileTextListModel storeProfileTextListModel;
@@ -281,11 +288,23 @@ public class SellerStoreController extends BaseController {
     })
     })
     @VendorLogger(option = "编辑店铺经营状态接口")
     @VendorLogger(option = "编辑店铺经营状态接口")
     @PostMapping("updateBusinessState")
     @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 = "webSite", required = false, defaultValue = "1") String webSite,
                                                         @RequestParam(value = "businessState") Integer businessState) {
                                                         @RequestParam(value = "businessState") Integer businessState) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         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();
         String logMsg = "店铺id:" + vendor.getStoreId();
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
         if (WebSiteConstant.MEMBER_OVERSEA.equals(webSite)) {
             Store store = new Store();
             Store store = new Store();
@@ -312,7 +331,8 @@ public class SellerStoreController extends BaseController {
                 storeSiteInfoModel.updateStoreSiteInfo(storeSiteInfo);
                 storeSiteInfoModel.updateStoreSiteInfo(storeSiteInfo);
             }
             }
         }
         }
-        return SldResponse.success("设置成功", logMsg);
+
+        return SldResponse.success("设置成功", logMsg, deco);
     }
     }