From 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 22 七月 2021 16:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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 4d5f529..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,17 +1,25 @@
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.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.PayUtil;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.List;
+import java.util.Map;
/**
* @auther lyq
@@ -26,10 +34,20 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private WxMaProperties properties;
@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);
}
@@ -63,6 +81,24 @@
return R.fail("请重新登陆");
}
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 = "购物车添加")
@@ -148,6 +184,7 @@
}
orderCreateDTO.setUserId(loginUserInfo.getUserId());
orderCreateDTO.setPhone(loginUserInfo.getPhone());
+ orderCreateDTO.setOpenId(loginUserInfo.getOpenid());
return communityService.orderCreate(orderCreateDTO);
}
@@ -206,5 +243,16 @@
return communityService.orderStatistics(loginUserInfo.getUserId());
}
+ @ApiOperation(value = "小程序微信调起支付")
+ @PostMapping("wxpay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请重新登陆");
+ }
+ orderPayDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.wxPay(orderPayDTO);
+ }
+
}
--
Gitblit v1.7.1