From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 948 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 482 insertions(+), 466 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index 39ad2ee..90a8da2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -1,53 +1,16 @@
package com.panzhihua.service_community.api;
-import java.util.List;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import com.panzhihua.service_community.service.*;
+import com.panzhihua.service_community.util.QRCodeUtil;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-
-import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
-import com.panzhihua.service_community.service.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.panzhihua.common.model.dtos.PageDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
-import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
-import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
-import com.panzhihua.common.model.vos.shop.ShopStoreVO;
-import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
-
-import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -56,509 +19,562 @@
@Resource
private ComShopFlowerGoodsService comShopFlowerGoodsService;
-// @Resource
-// private ComShopOperLogService comShopOperLogService;
-// @Resource
-// private ComShopOrderService comShopOrderService;
-// @Resource
-// private ComShopCartService comShopCartService;
-// @Resource
-// private ComShopUserAddressService comShopUserAddressService;
-
+ @Resource
+ private ComShopFlowerOrderService comShopFlowerOrderService;
+ @Resource
+ private ComShopFlowerUserAddressService comShopUserAddressService;
@Resource
private ConvenientMerchantService convenientMerchantService;
@Resource
- private UserService userService;
+ private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
+ @Resource
+ private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
+ @Resource
+ private ComShopFlowerRefundOrderService comShopFlowerRefundOrderService;
+ @Resource
+ private ComShopFlowerOrderPayService comShopFlowerOrderPayService;
- /*
- *//**
- * 分页查询 商家订单
- *
- * @param pageComShopOrderSearchDTO
- * 分页数据
- * @return 分页订单
- *//*
- @PostMapping("/order/page")
- public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
- return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
- }
- *//**
- * 根据店铺id查询店铺详情
- *
- * @param comShopStoreDTO
- * 请求参数
- * @return 店铺详情
- *//*
- @PostMapping("shopStoreDetail")
- public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
- return comShopStoreService.shopStoreDetail(comShopStoreDTO);
- }
-
- *//**
- * 分页查询商品列表
- *
- * @param comShopGoodsDTO
- * 请求参数
- * @return 商品列表
- *//*
- @PostMapping("/pageShopGoods")
- public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
-
- return comShopFlowerGoodsService.pageShopGoods(comShopGoodsDTO);
- }
-
- *//**
- * 根据商品id查询商品详情
- *
- * @param goodsId
- * 商品id
- * @return 商品信息
- *//*
- @PostMapping("shopGoodsDetail")
- public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
- return comShopFlowerGoodsService.shopGoodsDetail(goodsId);
- }
-
- *//**
- * 根据用户id查询购物车列表
- *
- * @param userId
- * 用户id
- * @return 购物车列表信息
- *//*
- @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);
- }
-
- *//**
- * 购物车添加
- *
- * @param comShopCartDTO
- * 请求参数
- * @return 添加结果
- *//*
- @PostMapping("shopAddCart")
- public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
- return comShopCartService.shopAddCart(comShopCartDTO);
- }
-
- *//**
- * 购物车内商品数量添加
- *
- * @param shopEditNubCartDTO
- * 请求参数
- * @return 修改结果
- *//*
- @PostMapping("shopEditNubCart")
- public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
- return comShopCartService.shopEditNubCart(shopEditNubCartDTO);
- }
-
- *//**
- * 删除购物车记录
- *
- * @param Ids
- * 购物车id集合
- * @return 删除结果
- *//*
- @PostMapping("shopDelCart")
- public R shopDelCart(@RequestBody List<Long> Ids) {
- return comShopCartService.shopDelCart(Ids);
- }
-
- *//**
- * 查询用户收货地址列表
- *
- * @param comShopAddressDTO
- * 请求参数
- * @return 用户收获地址列表
- *//*
- @PostMapping("shopUserAddressList")
- public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
- return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
- }
-
- *//**
- * 用户添加书货地址
- *
- * @param comShopAddressDTO
- * 请求参数
- * @return 添加结果
- *//*
- @PostMapping("shopAddUserAddress")
- public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
- return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
- }
-
- *//**
- * 用户修改收货地址
- *
- * @param comShopAddressDTO
- * 请求参数
- * @return 修改结果
- *//*
- @PostMapping("shopEditUserAddress")
- public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
- return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
- }
-
- *//**
- * 用户删除收货地址
- *
- * @param addressId
- * 收货地址id
- * @return 删除结果
- *//*
- @PostMapping("shopDelUserAddress")
- public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
- return comShopUserAddressService.shopDelUserAddress(addressId);
- }
-
- *//**
- * 订单预览
- *
- * @param orderPreviewDTO
- * 请求参数
- * @return 订单预览数据
- *//*
- @PostMapping("orderPreview")
- public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
- return comShopOrderService.orderPreview(orderPreviewDTO);
- }
-
- *//**
- * 创建订单
- *
- * @param orderCreateDTO
- * 创建订单请求参数
- * @return 创建结果
- *//*
- @PostMapping("orderCreate")
- public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
- return comShopOrderService.orderCreate(orderCreateDTO);
- }
-
- *//**
- * 分页查询用户订单列表
- *
- * @param comOrderListDTO
- * 请求参数
- * @return 查询结果
- *//*
- @PostMapping("pageOrderList")
- public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
- return comShopOrderService.pageOrderList(comOrderListDTO);
- }
-
- *//**
- * 根据订单id查询订单详情
- *
- * @param orderId
- * 订单id
- * @return 订单详情
- *//*
- @PostMapping("orderDetail")
- public R orderDetail(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDetail(orderId);
- }
-
- *//**
- * 根据订单id取消订单
- *
- * @param comShopOrderQueryDTO
- * 请求参数
- * @return 取消结果
- *//*
- @PostMapping("orderCancel")
- public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO);
- }
-
- *//**
- * 根据订单id删除订单
- *
- * @param orderId
- * 订单id
- * @return 删除结果
- *//*
- @PostMapping("orderDelete")
- public R orderDelete(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDelete(orderId);
- }
-
- *//**
- * 根据订单id确认收货
- *
- * @param comShopOrderQueryDTO
- * 请求参数
- * @return 确认结果
- *//*
- @PostMapping("orderConfirm")
- public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
- }
-
- *//**
- * 统计用户订单数量
- *
- * @param userId
- * 用户id
- * @return 统计结果
- *//*
- @PostMapping("orderStatistics")
- public R orderStatistics(@RequestParam("userId") Long userId) {
- return comShopOrderService.orderStatistics(userId);
- }
-
- *//**
+ /**
* 商品列表-分页查询
*
- * @param pageComShopGoodsDTO
- * 查询参数
+ * @param pageComShopGoodsDTO 查询参数
* @return PageShopStoreVO
- *//*
+ */
@PostMapping("pageGoods")
- public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
- return comShopFlowerGoodsService.pageGoodsList(pageComShopGoodsDTO);
+ public R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO) {
+ return comShopFlowerGoodsService.pageFlowerGoodsList(pageComShopGoodsDTO);
}
- *//**
+ /**
+ * 商品列表-APP分页查询
+ *
+ * @param comShopFlowerGoodsDTO 查询参数
+ * @return PageShopStoreVO
+ */
+ @PostMapping("pageShopFlowerGoodsByApp")
+ public R pageShopFlowerGoodsByApp(@RequestBody ComShopFlowerGoodsDTO comShopFlowerGoodsDTO) {
+ return comShopFlowerGoodsService.pageShopFlowerGoodsByApp(comShopFlowerGoodsDTO);
+ }
+
+ /**
* 新增商品
*
* @param addShopGoodsVO
* @return
- *//*
+ */
@PostMapping("saveShopGoods")
- public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
- return comShopFlowerGoodsService.saveShopGoods(addShopGoodsVO);
+ public R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.saveShopFlowerGoods(addShopGoodsVO);
}
- *//**
+ /**
* 编辑商品
*
* @param addShopGoodsVO
- * @param id
- * 商铺Id
+ * @param id 商铺Id
* @return
- *//*
+ */
@Transactional(rollbackFor = Exception.class)
@PostMapping("editShopGoods/{id}")
- public R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
- return comShopFlowerGoodsService.editShopGoods(id, addShopGoodsVO);
+ public R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.editFlowerShopGoods(id, addShopGoodsVO);
}
- *//**
+ /**
* 删除商品
*
- * @param id
+ * @param goodsId
* @return
- *//*
- @PostMapping("deleteShopGoods")
- public R deleteShopGoods(@RequestBody Long[] id) {
- return comShopFlowerGoodsService.deleteShopGoods(id);
+ */
+ @DeleteMapping("deleteShopGoods")
+ public R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId) {
+ return comShopFlowerGoodsService.deleteShopFlowerGoods(goodsId);
}
- *//**
+ /**
+ * 根据商品id查询商品详情
+ *
+ * @param goodsId 商品id
+ * @return 商品信息
+ */
+ @GetMapping("shopGoodsDetail")
+ public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
+ return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
+ }
+
+ /**
* 修改商品状态
*
* @param id
* @return
- *//*
+ */
@GetMapping("changeShopGoodsStatus")
- public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+ public R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
return comShopFlowerGoodsService.changeStatus(id, status);
}
- *//**
- * 商家资金的订单详情
+ /**
+ * 查询用户收货地址列表
+ *
+ * @param comShopAddressDTO 请求参数
+ * @return 用户收获地址列表
+ */
+ @PostMapping("shopUserAddressList")
+ public R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
+ }
+
+ /**
+ * 用户添加书货地址
+ *
+ * @param comShopAddressDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("shopAddUserAddress")
+ public R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
+ }
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("shopEditUserAddress")
+ public R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+ return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
+ }
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId 收货地址id
+ * @return 删除结果
+ */
+ @DeleteMapping("shopDelUserAddress")
+ public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
+ return comShopUserAddressService.shopDelUserAddress(addressId);
+ }
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("orderPreview")
+ public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
+ return comShopFlowerOrderService.orderPreview(orderPreviewDTO);
+ }
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("orderCreate")
+ public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
+ return comShopFlowerOrderService.orderCreate(orderCreateDTO);
+ }
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("pageOrderList")
+ public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
+ return comShopFlowerOrderService.pageOrderList(comOrderListDTO);
+ }
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId 订单id
+ * @return 订单详情
+ */
+ @GetMapping("orderDetail")
+ public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) {
+ return comShopFlowerOrderService.orderDetail(orderId,phone);
+ }
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("orderCancel")
+ public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ return comShopFlowerOrderService.orderCancel(comShopOrderQueryDTO);
+ }
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId 订单id
+ * @return 删除结果
+ */
+ @DeleteMapping("orderDelete")
+ public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
+ return comShopFlowerOrderService.orderDelete(orderId);
+ }
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("orderConfirm")
+ public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+ return comShopFlowerOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
+ }
+
+ /**
+ * 分页查询 商家订单
+ *
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 分页订单
+ */
+ @PostMapping("/order/page")
+ public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+ return comShopFlowerOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+ }
+
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shipOrder")
+ public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+ return comShopFlowerOrderService.shipOrder(orderShipDTO);
+ }
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/deliverOrder")
+ public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopFlowerOrderService.deliverOrder(deliverDTO);
+ }
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/finishDeliverOrder")
+ public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopFlowerOrderService.finishDeliverOrder(deliverDTO);
+ }
+
+
+ /**
+ * 保存评价
+ *
+ * @param comShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/saveEvaluate")
+ public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
+ return comShopFlowerEvaluateService.saveEvaluate(comShopFlowerEvaluateDTO);
+ }
+
+ /**
+ * 分页查询评价
+ *
+ * @param pageComShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/pageEvaluate")
+ public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
+ return comShopFlowerEvaluateService.pageEvaluate(pageComShopFlowerEvaluateDTO);
+ }
+
+ /**
+ * 评价详情
*
* @param id
* @return
- *//*
- @GetMapping("capitalDetailByStore")
- public R capitalDetailByStore(@RequestParam("id") Long id) {
- return comShopOrderService.capitalDetailByStore(id);
+ */
+ @GetMapping("/detailEvaluate")
+ public R detailEvaluate(@RequestParam("id") Long id) {
+ return comShopFlowerEvaluateService.detailEvaluate(id);
}
- *//**
- * 订单发货
+ /**
+ * 删除评价
*
- * @param orderShipDTO
- * 发货信息
- * @return 发货结果
- *//*
- @PostMapping("/shipOrder")
- R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
- return comShopOrderService.shipOrder(orderShipDTO);
+ * @param id
+ * @return
+ */
+ @DeleteMapping("deleteEvaluate")
+ public R deleteEvaluate(@RequestParam("id") Long id) {
+ return comShopFlowerEvaluateService.deleteEvaluate(id);
}
- *//**
- * 订单配送
+ /**
+ * 取货码
*
- * @param deliverDTO
- * 订单ID
- * @return 配送结果
- *//*
- @PostMapping("/deliverOrder")
- R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.deliverOrder(deliverDTO);
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取货码")
+ @GetMapping("getQRCode")
+ public R getQRCode(@RequestParam("id") Long id) {
+ return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
}
- *//**
- * 订单配送
+
+ /**
+ * 保存配送单
*
- * @param deliverDTO
- * 订单ID
- * @return 配送完成
- *//*
- @PostMapping("/finishDeliverOrder")
- R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.finishDeliverOrder(deliverDTO);
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("saveDelivery")
+ public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.saveDelivery(comShopFlowerOrderDeliveryDTO);
}
- *//**
- * 订单导出信息
+ /**
+ * 更新配送单
*
- * @param comShopOrderExportDTO
- * 订单导出信息
- * @return 订单导出信息
- *//*
- @PostMapping("/shopOrderExportData")
- R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
- return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("updateDelivery")
+ public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.updateDelivery(comShopFlowerOrderDeliveryDTO);
}
- *//**
- * 资金管理导出信息
+ /**
+ * 已配送、已送达 分页查询
*
- * @param comShopFundsExportDTO
- * 资金管理导出信息
- * @return 资金管理导出信息
- *//*
- @PostMapping("/shopOrderFundsExportData")
- R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
- return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageDelivery")
+ public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageDelivery(pageComFlowerOrderDeliveryDTO);
}
- *//**
- * 用户资金统计信息
+ /**
+ * 未配送 分页查询
*
- * @param userId
- * 用户ID
- * @return 统计信息
- *//*
- @GetMapping("/getFundsStat")
- R getFundsStat(@RequestParam("userId") Long userId) {
- return comShopOrderService.getFundsStat(userId);
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageNoDelivery")
+ public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
}
- *//**
- * 店铺资金统计信息
+ /**
+ * 未配送-开始配送-订单列表
*
- * @param pageComShopFundsSearchDTO
- * 店铺资金
- * @return 店铺资金统计信息
- *//*
- @PostMapping("/pageShopFunds")
- R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
- return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageNoDeliveryOrderList")
+ public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
}
- *//**
+ /**
+ * 根据商家id查询商家的订单
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByStoreId")
+ public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderService.pageOrderByStoreId(pageComFlowerOrderListDTO);
+ }
+
+ /**
* 微信支付订单回调
*
* @param wxPayNotifyOrderDTO
* 订单支付回调参数
- *//*
+ */
@PostMapping("/wxOrderPayNotify")
- public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
- comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+ public void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
+ comShopFlowerOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
}
- *//**
+ /**
* 点击去支付订单
*
* @param orderPayDTO
* 请求参数
* @return 支付对象
- *//*
+ */
@PostMapping("/wxPay")
- public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
- return comShopOrderService.wxPay(orderPayDTO);
+ public R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO) {
+ return comShopFlowerOrderService.wxPay(orderPayDTO);
}
- *//**
- * 商城系统配置
- *
- * @param comShopSysConfDTO
+ /**
+ * 查询订单总数
+ * @param deliveryType
* @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();
+ */
+ @GetMapping("/selectCountByDeliveryType")
+ public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId){
+ return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,userId);
}
- *//**
- * 商城系统配置查询
- *
- * @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();
- }
-
- *//**
- * check商家/店铺是否有效
+ /**
+ * 查询我的店铺各类统计数据
* @param userId
* @return
- *//*
- @GetMapping("/checkStoreIsValid")
- public R checkStoreIsValid(@RequestParam("userId") Long userId) {
- Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
- Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
- Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
- return R.ok(isShopValid || isConvenientValid || isMcsValid);
- }*/
+ */
+ @GetMapping("/selectCountByUserId")
+ public R selectCountByUserId(@RequestParam("userId") Long userId){
+ return comShopFlowerOrderService.selectCountByUserId(userId);
+ }
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("createRefundOrder")
+ public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return comShopFlowerRefundOrderService.createRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+ /**
+ * 分页查询
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrder")
+ public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
+ return comShopFlowerRefundOrderService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("updateRefundOrder")
+ public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return comShopFlowerRefundOrderService.updateRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+
+ /**
+ * 商家后台-退款申请统计
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectCountGroupStatus")
+ public R selectCountGroupStatus(@RequestParam("storeId") Long storeId){
+ return comShopFlowerRefundOrderService.selectCountGroupStatus(storeId);
+ }
+
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("incrGoodsView")
+ public R incrGoodsView(@RequestParam("goodsId") Long goodsId){
+ return comShopFlowerGoodsService.incrGoodsView(goodsId);
+ }
+
+ /**
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
+ */
+ @PostMapping("pageOrderPay")
+ public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO){
+ return comShopFlowerOrderPayService.pageOrderPay(pageComShopFlowerOrderPayDTO);
+ }
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @GetMapping("getQuota")
+ public R getQuota(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.getQuota(storeId);
+ }
+
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectSumOrderAndAmountByStoreId")
+ public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.selectSumOrderAndAmountByStoreId(storeId);
+ }
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("selectOrderLineChart")
+ public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab){
+ return comShopFlowerOrderService.selectOrderLineChart(storeId,type,tab);
+ }
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderCancel")
+ public R refundOrderCancel(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.orderCancel(id);
+ }
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderDetail")
+ public R refundOrderDetail(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.refundOrderDetail(id);
+ }
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByDeliveryNo")
+ public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
+ return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 统计上架的上下架商品数量
+ * @param userId
+ * @return
+ */
+ @GetMapping("/countSaleByUserId")
+ R countSaleByUserId(@RequestParam("userId") Long userId){
+ return comShopFlowerGoodsService.countSaleByUserId(userId);
+ }
+
}
--
Gitblit v1.7.1