From f0e82623c9b60b17210da35deec49d27f79c1383 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 11 十月 2022 16:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
index 9c4957a..ec1f432 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java
@@ -192,6 +192,20 @@
}
}
+ @ApiOperation("ws洗车推送")
+ @PostMapping("/wsPush")
+ public R wsPush(@RequestBody String aesString){
+ try {
+ Map<String, String> aesMap= (Map<String, String>) JSON.parse(aesString);
+ String desString=MyAESUtil.Decrypt(aesMap.get("aesString"),"Ryo7M3n8loC5Abcd");
+ Map<String,String> desMap= (Map) JSON.parse(desString);
+ return userService.wsPush(desMap.get("washer_mobile"),desMap.get("phone"),desMap.get("washer_name"),Integer.parseInt(desMap.get("order_status")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.fail("推送失败");
+ }
+
+ }
/**
* 电动车商城商品购买支付回调
@@ -328,4 +342,9 @@
buffer.append("</xml>");
return buffer.toString();
}
+
+ @GetMapping("/settle")
+ public R settle(String settleDate){
+ return R.ok(umfPayUtil.settle(settleDate));
+ }
}
--
Gitblit v1.7.1