From a438efdb271973368246cac3b761d7263623f55e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 14 五月 2021 10:31:39 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
index 13ef97b..0fc0acb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -1,5 +1,6 @@
package com.panzhihua.applets.api;
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaProperties;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.*;
@@ -39,6 +40,14 @@
@ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class)
@PostMapping("pageshopstore")
public R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
+ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO();
+ R conf = communityService.pageShopSysConf(pageComShopSysConfDTO);
+ if(R.isOk(conf)&& conf.getData()!=null){
+ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class);
+ if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){
+ return R.ok();
+ }
+ }
return communityService.pageShopStore(comShopStoreDTO);
}
@@ -81,6 +90,14 @@
if(userId == null){
return R.fail("请重新登陆");
}
+ PageComShopSysConfDTO pageComShopSysConfDTO = new PageComShopSysConfDTO();
+ R conf = communityService.pageShopSysConf(pageComShopSysConfDTO);
+ if(R.isOk(conf)&& conf.getData()!=null){
+ ComShopSysConfVO comShopSysConfVO = JSONObject.parseObject(JSONObject.toJSONString(conf.getData()), ComShopSysConfVO.class);
+ if("1".equals(comShopSysConfVO.getVal()) && "1".equals(comShopSysConfVO.getEnabled())){
+ return R.ok(0);
+ }
+ }
return communityService.shopCartUserTotal(userId);
}
--
Gitblit v1.7.1