From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 215 insertions(+), 6 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 6a69217..cbce986 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,18 +1,26 @@
package com.panzhihua.service_community.api;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
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.NonNull;
import lombok.extern.slf4j.Slf4j;
+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;
@@ -26,16 +34,18 @@
@Resource
private ComShopGoodsService comShopGoodsService;
@Resource
+ private ComShopOperLogService comShopOperLogService;
+ @Resource
+ private ComShopOrderService comShopOrderService;
+ @Resource
private ComShopCartService comShopCartService;
@Resource
private ComShopUserAddressService comShopUserAddressService;
- @Resource
- private ComShopOrderService comShopOrderService;
/**
* 店铺列表-分页查询
* @param pageComShopStoreDTO 查询参数
- * @return ComShopStoreVO
+ * @return PageShopStoreVO
*/
@PostMapping("/pageShopStore")
public R pageShopStore(@RequestBody PageComShopStoreDTO pageComShopStoreDTO) {
@@ -89,6 +99,49 @@
/**
+ * 获取用户商铺详细
+ *
+ * @param userId 用户ID
+ * @return
+ */
+ @GetMapping("/getUserStoreInfo")
+ public R getUserStoreInfo(@RequestParam("userId") Long userId) {
+ return comShopStoreService.getUserStoreInfo(userId);
+ }
+
+ /**
+ * 添加商城后台日志
+ *
+ * @param shopOperlog 商城日志
+ * @return 添加结果
+ */
+ @PostMapping("/addShopOperLog")
+ public R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog) {
+ return comShopOperLogService.saveLog(shopOperlog);
+ }
+
+
+ /**
+ * 分页查询 商家后台操作日志
+ * @param pageDTO 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/pageShopOperLog")
+ public R pageShopOperLog(@RequestBody PageDTO pageDTO) {
+ return comShopOperLogService.pageShopOperLog(pageDTO);
+ }
+
+
+ /**
+ * 分页查询 商家订单
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 分页订单
+ */
+ @PostMapping("/order/page")
+ public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+ }
+ /**
* 根据店铺id查询店铺详情
* @param comShopStoreDTO 请求参数
* @return 店铺详情
@@ -103,8 +156,9 @@
* @param comShopGoodsDTO 请求参数
* @return 商品列表
*/
- @PostMapping("pageShopGoods")
+ @PostMapping("/pageShopGoods")
public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
+
return comShopGoodsService.pageShopGoods(comShopGoodsDTO);
}
@@ -278,4 +332,159 @@
return comShopOrderService.orderStatistics(userId);
}
+
+
+
+ /**
+ * 商品列表-分页查询
+ * @param pageComShopGoodsDTO 查询参数
+ * @return PageShopStoreVO
+ */
+ @PostMapping("pageGoods")
+ public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
+ return comShopGoodsService.pageGoodsList(pageComShopGoodsDTO);
+ }
+
+ /**
+ * 新增商品
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("saveShopGoods")
+ public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
+ return comShopGoodsService.saveShopGoods(addShopGoodsVO);
+ }
+
+ /**
+ * 编辑商品
+ * @param addShopGoodsVO
+ * @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);
+ }
+
+ /**
+ * 删除商品
+ * @param id
+ * @return
+ */
+ @PostMapping("deleteShopGoods")
+ public R deleteShopGoods(@RequestBody Long[] id) {
+ return comShopGoodsService.deleteShopGoods(id);
+ }
+
+ /**
+ * 修改商品状态
+ * @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);
+ }
+
+ /**
+ * 订单发货
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO){
+ return comShopOrderService.shipOrder(orderShipDTO);
+ }
+
+ /**
+ * 订单配送
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
+ Long orderId = deliverDTO.getOrderId();
+ return comShopOrderService.deliverOrder(orderId);
+ }
+ /**
+ * 订单配送
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
+ Long orderId = deliverDTO.getOrderId();
+ return comShopOrderService.finishDeliverOrder(orderId);
+ }
+
+ /**
+ * 订单导出信息
+ * @param comShopOrderExportDTO 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO){
+ return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
+ }
+
+ /**
+ * 资金管理导出信息
+ * @param comShopFundsExportDTO 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO){
+ return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
+ }
+
+
+ /**
+ * 用户资金统计信息
+ * @param userId 用户ID
+ * @return 统计信息
+ */
+ @GetMapping("/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId){
+ return comShopOrderService.getFundsStat(userId);
+ }
+
+ /**
+ * 店铺资金统计信息
+ * @param pageComShopFundsSearchDTO 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO){
+ 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);
+ }
}
--
Gitblit v1.7.1