From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 10:33:15 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 74 ++++++++++++++++++++++++++++++-------
1 files changed, 60 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 9093d45..6580a2b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -31,7 +31,7 @@
@Slf4j
@RestController
@RequestMapping("/shopFlower/")
-@Api(tags = {"商城服务"})
+@Api(tags = {"花城商城服务"})
public class ShopFlowerApi extends BaseController {
@Resource
@@ -169,7 +169,7 @@
@PostMapping("orderDetail")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDetail(@RequestParam("orderId") Long orderId) {
- return communityService.orderDetail(orderId);
+ return communityService.orderDetailFlower(orderId);
}
@ApiOperation(value = "取消订单")
@@ -200,17 +200,6 @@
}
-
-/* @ApiOperation(value = "统计当前用户订单", response = OrderStatisticsVO.class)
- @PostMapping("orderStatistics")
- public R orderStatistics() {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if (loginUserInfo == null) {
- return R.fail("请重新登陆");
- }
- return communityService.orderStatistics(loginUserInfo.getUserId());
- }*/
-
@ApiOperation(value = "小程序微信调起支付")
@PostMapping("wxpay")
public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
@@ -219,7 +208,7 @@
return R.fail("请重新登陆");
}
orderPayDTO.setOpenId(loginUserInfo.getOpenid());
- return communityService.wxPay(orderPayDTO);
+ return communityService.wxPayFlower(orderPayDTO);
}
/**
@@ -374,5 +363,62 @@
return communityService.pageOrderByStoreId(pageComFlowerOrderListDTO);
}
+ /**
+ * 查询我的店铺各类统计数据
+ * @param storeId
+ * @return
+ */
+ @ApiOperation(value = "查询我的店铺各类统计数据")
+ @GetMapping("/selectCountByStoreId")
+ public R selectCountByStoreId(Long storeId){
+ return communityService.selectCountByStoreId(storeId);
+ }
+
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("createRefundOrder")
+ @ApiOperation(value = "创建退款订单")
+ public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+ /**
+ * 用户 分页查询退款订单
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrder")
+ @ApiOperation(value = "退款订单分页查询 用户",response = ComShopFlowerRefundOrderVO.class)
+ public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
+ pageComOrderRefundDTO.setUserId(this.getUserId());
+ return communityService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("updateRefundOrder")
+ @ApiOperation(value = "修改退款订单")
+ public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return communityService.updateRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+
+ /**
+ * 商家后台-退款申请统计
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectCountGroupStatus")
+ @ApiOperation(value = "商家后台-退款申请统计")
+ public R selectCountGroupStatus(Long storeId){
+ return communityService.selectCountGroupStatus(storeId);
+ }
}
--
Gitblit v1.7.1