From 5d5a187689e51a8a74f16b91d23d32a74b39e803 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期二, 06 五月 2025 18:48:51 +0800
Subject: [PATCH] feat: 新增回调手动重推
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
index d7a9801..2ed5f28 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbOrdersController.java
@@ -4,6 +4,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.annotation.Anonymous;
@@ -83,8 +84,8 @@
* @param tbOrders
* @return
*/
-// @Anonymous(needSign = true)
- @Anonymous
+ @Anonymous(needSign = true)
+// @Anonymous
// @Log(title = "orders", businessType = BusinessType.INSERT)
@ApiOperation("鏂板璁㈠崟")
@ApiImplicitParams({
@@ -103,17 +104,25 @@
@ApiImplicitParam(name = "bookingPrice", value = "鎶ヤ环", dataType = "BigDecimal")
})
@PostMapping("/add")
- public AjaxResult add(@RequestBody TbOrders tbOrders) {
+ public AjaxResult add(@RequestBody TbOrders tbOrders,String appId) {
try {
if (tbOrders == null || tbOrders.getOrderID() == null) {
return AjaxResult.error("浼犺緭鏁版嵁涓虹┖锛�");
}
+ if(appId ==null|| Objects.equals(appId, ""))
+ {
+ return AjaxResult.error("appid涓嶈兘涓虹┖锛�");
+ }
+
+ tbOrders.setAppId(appId);
tbOrders.setCreateTime(new Date());
tbOrdersService.insertTbOrders(tbOrders);
- SysClientApp scApp = clientAppService.selectSysClientAppByAppId(1L);
+
+ SysClientApp scApp = clientAppService.selectSysClientAppByAppKey(tbOrders.getAppId());
+
ServiceOrderAppVo model = new ServiceOrderAppVo();
@@ -125,7 +134,7 @@
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
// 璁剧疆棰勭害鏃堕棿涓轰竴澶╁悗
Calendar calendar = Calendar.getInstance();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd%20HH:mm");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
@@ -188,7 +197,7 @@
// model.setCoTies("瀹跺睘"); // 闅忔満璁剧疆瀹㈡埛鑱旂郴浜轰笌鎮ｈ�呭叧绯�
// 璁剧疆棰勭害鏃堕棿涓轰竴澶╁悗
Calendar calendar = Calendar.getInstance();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd%20HH:mm");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
model.setApptDate(sdf.format(tbOrders.getBookingDate())); // 鏍煎紡鍖栭绾﹁繍閫佹椂闂�
model.setPtName(tbOrders.getPatientName()); // 鎮ｈ�呭鍚�
--
Gitblit v1.9.1