From c62a0fd9f7cf7c5a8d7e9ac1fb935a2a60f230cb Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 21 七月 2021 15:46:05 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 0f28c5c..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);
}
@@ -74,6 +83,24 @@
return communityService.shopCartList(userId);
}
+ @ApiOperation(value = "查询用户购物车商品数量")
+ @PostMapping("shopCartUserTotal")
+ public R shopCartUserTotal() {
+ Long userId = this.getUserId();
+ 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);
+ }
+
@ApiOperation(value = "购物车添加")
@PostMapping("shopAddCart")
public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
--
Gitblit v1.7.1