From 1772afb069b75871572c9c438bbd2bc403f864df Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 13 十二月 2023 11:43:51 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 10b7122..4aac451 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.controller.concole;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
@@ -7,10 +9,7 @@
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.*;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -170,4 +169,21 @@
return R.ok(memberSimpleTotalVo);
}
+
+ @GetMapping("/queryBill")
+ public R<ProfitSharingResult> queryBill(String orderId) throws WxPayException {
+ ProfitSharingResult result = orderService.queryBill(orderId);
+ return R.ok(result);
+ }
+
+ /**
+ * 获取活动订单商品id
+ * @param activityId
+ * @return
+ */
+ @PostMapping("/getActivityOrderGoods")
+ public R<List<String>> getActivityOrderGoods(@RequestBody String activityId){
+ List<String> activityOrderGoods = orderService.getActivityOrderGoods(activityId);
+ return R.ok(activityOrderGoods);
+ }
}
--
Gitblit v1.7.1