From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index 3a701af..e16a973 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.controller.BaseController;
@@ -7,15 +9,15 @@
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
+import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
import com.panzhihua.service_community.service.*;
-import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
-import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.service.ComShopGoodsService;
import com.panzhihua.service_community.service.ComShopOperLogService;
import com.panzhihua.service_community.service.ComShopOrderService;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -41,6 +43,8 @@
private ComShopCartService comShopCartService;
@Resource
private ComShopUserAddressService comShopUserAddressService;
+ @Resource
+ private ComShopSysConfService comShopSysConfService;
/**
* 店铺列表-分页查询
@@ -61,6 +65,16 @@
@PostMapping("/saveStore")
public R saveStore(@RequestBody ShopStoreVO storeVO) {
return comShopStoreService.saveStore(storeVO);
+ }
+
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/addStore")
+ public R addStore(@RequestBody ShopStoreVO storeVO) {
+ return comShopStoreService.addStore(storeVO);
}
/**
@@ -107,6 +121,16 @@
@GetMapping("/getUserStoreInfo")
public R getUserStoreInfo(@RequestParam("userId") Long userId) {
return comShopStoreService.getUserStoreInfo(userId);
+ }
+ /**
+ * 获取用户商铺详细
+ *
+ * @param account 用户账号
+ * @return
+ */
+ @GetMapping("/getUserStoreInfoByAccount")
+ public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) {
+ return comShopStoreService.getUserStoreInfo(account);
}
/**
@@ -180,6 +204,16 @@
@PostMapping("shopCartList")
public R shopCartList(@RequestParam("userId") Long userId) {
return comShopCartService.shopCartList(userId);
+ }
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("shopCartUserTotal")
+ public R shopCartUserTotal(@RequestParam("userId") Long userId) {
+ return comShopCartService.shopCartUserTotal(userId);
}
/**
@@ -299,7 +333,7 @@
*/
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -361,6 +395,7 @@
* @param id 商铺Id
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
@PostMapping("editShopGoods/{id}")
public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
return comShopGoodsService.editShopGoods(id, addShopGoodsVO);
@@ -413,8 +448,7 @@
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.deliverOrder(orderId);
+ return comShopOrderService.deliverOrder(deliverDTO);
}
/**
* 订单配送
@@ -423,8 +457,7 @@
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.finishDeliverOrder(orderId);
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
}
/**
@@ -486,4 +519,51 @@
public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
return comShopOrderService.wxPay(orderPayDTO);
}
+
+
+
+ /**
+ * 商城系统配置
+ * @param comShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){
+ ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
+ switch (comShopSysConfDTO.getHidden()){
+ case 0:
+ comShopSysConfDO.setVal("0");
+ comShopSysConfDO.setEnabled("1");
+ break;
+ case 1:
+ comShopSysConfDO.setVal("1");
+ comShopSysConfDO.setEnabled("1");
+ break;
+ default: break;
+ }
+ int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
+ if(updated==1){
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 商城系统配置查询
+ * @param pageComShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO){
+ List<ComShopSysConfDO> confList = comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
+ .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN")
+ .orderByDesc(ComShopSysConfDO::getCreate_at));
+ ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
+ if(confList!=null && confList.size()>0){
+ ComShopSysConfDO firstConf = confList.get(0);
+ BeanUtils.copyProperties(firstConf, comShopSysConfVO);
+ return R.ok(comShopSysConfVO);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1