From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 09:40:51 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java
index 3006d95..3dc1879 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/McsOrderApi.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
+import com.panzhihua.common.utlis.SmsUtil;
import com.panzhihua.service_community.entity.McsOrder;
import com.panzhihua.service_community.service.McsOrderService;
import org.springframework.beans.BeanUtils;
@@ -50,7 +51,7 @@
*/
@GetMapping("{id}")
public R selectOne(@PathVariable("id") Long id) {
- return R.ok(this.mcsOrderService.getById(id));
+ return this.mcsOrderService.detail(id);
}
/**
@@ -77,4 +78,34 @@
return R.ok(this.mcsOrderService.updateById(mcsOrder));
}
+ /**
+ * 微信支付
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/wxPay")
+ public R wxPay(@RequestBody McsOrderVO mcsOrderVO){
+ return this.mcsOrderService.wxPay(mcsOrderVO);
+ }
+
+ /**
+ * 发送提醒短信
+ * @param id
+ * @return
+ */
+ @GetMapping("/sendContent")
+ public R sendContent(@RequestParam("id") Long id){
+ return this.mcsOrderService.sendContent(id);
+ }
+
+ /**
+ *微信支付回调
+ * @param mcsOrderVO
+ * @return
+ */
+ @PostMapping("/notify")
+ public R notify(@RequestBody McsOrderVO mcsOrderVO){
+ return this.mcsOrderService.notify(mcsOrderVO);
+ }
+
}
--
Gitblit v1.7.1