From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 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 0fc0acb..e7e43e8 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,11 @@
package com.panzhihua.applets.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.WxMaProperties;
import com.panzhihua.common.controller.BaseController;
@@ -8,18 +14,11 @@
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;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -37,47 +36,48 @@
@Resource
private WxMaProperties properties;
- @ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class)
+ @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();
+ 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);
}
- @ApiOperation(value = "查询店铺详情" , response = PageShopStoreVO.class)
+ @ApiOperation(value = "查询店铺详情", response = PageShopStoreVO.class)
@PostMapping("shopstoredetail")
public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
- if(comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null){
+ if (comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null) {
return R.fail("参数错误");
}
return communityService.shopStoreDetail(comShopStoreDTO);
}
- @ApiOperation(value = "分页查询商品列表" , response = ComShopGoodsVO.class)
+ @ApiOperation(value = "分页查询商品列表", response = ComShopGoodsVO.class)
@PostMapping("pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
return communityService.pageShopGoods(comShopGoodsDTO);
}
- @ApiOperation(value = "查询商品详情" , response = ComShopGoodsVO.class)
+ @ApiOperation(value = "查询商品详情", response = ComShopGoodsVO.class)
@PostMapping("shopGoodsDetail")
- @ApiImplicitParam(name = "goodsId",value = "商品id",required = true)
+ @ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
return communityService.shopGoodsDetail(goodsId);
}
- @ApiOperation(value = "查询用户购物车列表" , response = ComShopCartVO.class)
+ @ApiOperation(value = "查询用户购物车列表", response = ComShopCartVO.class)
@PostMapping("shopCartList")
public R shopCartList() {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
return communityService.shopCartList(userId);
@@ -87,15 +87,16 @@
@PostMapping("shopCartUserTotal")
public R shopCartUserTotal() {
Long userId = this.getUserId();
- if(userId == null){
+ 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);
+ 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);
@@ -105,7 +106,7 @@
@PostMapping("shopAddCart")
public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
comShopCartDTO.setUserId(userId);
@@ -124,11 +125,11 @@
return communityService.shopDelCart(Ids);
}
- @ApiOperation(value = "查询用户收货地址列表" , response = ComShopUserAddressVO.class)
+ @ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
@PostMapping("shopUserAddressList")
public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
comShopAddressDTO.setUserId(userId);
@@ -139,7 +140,7 @@
@PostMapping("shopAddUserAddress")
public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
comShopAddressDTO.setUserId(userId);
@@ -150,7 +151,7 @@
@PostMapping("shopEditUserAddress")
public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
comShopAddressDTO.setUserId(userId);
@@ -159,7 +160,7 @@
@ApiOperation(value = "删除用户收货地址列表")
@PostMapping("shopDelUserAddress")
- @ApiImplicitParam(name = "addressId",value = "收货地址id",required = true)
+ @ApiImplicitParam(name = "addressId", value = "收货地址id", required = true)
public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
return communityService.shopDelUserAddress(addressId);
}
@@ -168,7 +169,7 @@
@PostMapping("orderPreview")
public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
Long userId = this.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登陆");
}
orderPreviewDTO.setUserId(userId);
@@ -179,7 +180,7 @@
@PostMapping("orderCreate")
public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
orderCreateDTO.setUserId(loginUserInfo.getUserId());
@@ -192,7 +193,7 @@
@PostMapping("pageOrderList")
public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
comOrderListDTO.setUserId(loginUserInfo.getUserId());
@@ -201,7 +202,7 @@
@ApiOperation(value = "查询订单详情", response = ComShopOrderPageVO.class)
@PostMapping("orderDetail")
- @ApiImplicitParam(name = "orderId",value = "订单id",required = true)
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDetail(@RequestParam("orderId") Long orderId) {
return communityService.orderDetail(orderId);
}
@@ -210,7 +211,7 @@
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
return communityService.orderCancel(comShopOrderQueryDTO);
@@ -218,7 +219,7 @@
@ApiOperation(value = "删除订单")
@PostMapping("orderDelete")
- @ApiImplicitParam(name = "orderId",value = "订单id",required = true)
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDelete(@RequestParam("orderId") Long orderId) {
return communityService.orderDelete(orderId);
}
@@ -227,7 +228,7 @@
@PostMapping("orderConfirm")
public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
return communityService.orderConfirm(comShopOrderQueryDTO);
@@ -237,7 +238,7 @@
@PostMapping("orderStatistics")
public R orderStatistics() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
return communityService.orderStatistics(loginUserInfo.getUserId());
@@ -245,9 +246,9 @@
@ApiOperation(value = "小程序微信调起支付")
@PostMapping("wxpay")
- public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo == null){
+ if (loginUserInfo == null) {
return R.fail("请重新登陆");
}
orderPayDTO.setOpenId(loginUserInfo.getOpenid());
@@ -255,4 +256,3 @@
}
}
-
--
Gitblit v1.7.1