From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java
index de8cbac..b6bd4c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/devops/OrderDevOpsController.java
@@ -1,7 +1,15 @@
package com.yeshi.fanli.controller.devops;
+import java.io.PrintWriter;
+
+import javax.annotation.Resource;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
+import com.yeshi.fanli.service.inter.order.OrderProcessService;
/**
* 杩愮淮璁㈠崟鎺ュ彛
@@ -13,8 +21,25 @@
@RequestMapping("devops/order")
public class OrderDevOpsController {
-
-
-
-
+ @Resource
+ private OrderProcessService orderProcessService;
+
+ /**
+ * 杩斿埄
+ * @param hongBaoId
+ * @param out
+ */
+ @RequestMapping("fanliByHongBaoId")
+ public void fanli(Long hongBaoId, PrintWriter out) {
+ try {
+ orderProcessService.fanli(new HongBaoV2(hongBaoId));
+ out.print("success");
+ } catch (TaoBaoWeiQuanException e) {
+ e.printStackTrace();
+ out.print(e.getMessage());
+ } catch (Exception e) {
+ out.print(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.8.0