From 3efeec05fa3bbfdfc471550118d14d884225c5ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 24 七月 2021 15:12:30 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 136 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 122 insertions(+), 14 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 72867c2..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,20 +9,20 @@
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.service_community.model.dos.ComShopOrderDO;
+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.*;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotNull;
@@ -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);
}
/**
@@ -158,6 +182,7 @@
*/
@PostMapping("/pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
}
@@ -179,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);
}
/**
@@ -298,7 +333,7 @@
*/
@PostMapping("orderCancel")
public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
+ return comShopOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -360,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);
@@ -376,13 +412,23 @@
}
/**
- * 删除商品
+ * 修改商品状态
* @param id
* @return
*/
@GetMapping("changeShopGoodsStatus")
public R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) {
return comShopGoodsService.changeStatus(id,status);
+ }
+
+ /**
+ * 商家资金的订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("capitalDetailByStore")
+ public R capitalDetailByStore(@RequestParam("id") Long id) {
+ return comShopOrderService.capitalDetailByStore(id);
}
/**
@@ -396,24 +442,22 @@
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送结果
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.deliverOrder(orderId);
+ return comShopOrderService.deliverOrder(deliverDTO);
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送完成
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
- Long orderId = deliverDTO.getOrderId();
- return comShopOrderService.finishDeliverOrder(orderId);
+ return comShopOrderService.finishDeliverOrder(deliverDTO);
}
/**
@@ -457,5 +501,69 @@
return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
}
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ @PostMapping("/wxOrderPayNotify")
+ public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO){
+ comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+ }
+ /**
+ * 点击去支付订单
+ * @param orderPayDTO 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/wxPay")
+ 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