From a366530662bd20eb8bfd7fcfb72deb003baff923 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 16:23:55 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 02fcf80..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
@@ -21,9 +21,8 @@
import io.swagger.annotations.ApiOperation;
import com.panzhihua.common.service.community.ComBatteryCommodityOrderFeign;
import org.json.XML;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -193,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("推送失败");
+ }
+
+ }
/**
* 电动车商城商品购买支付回调
@@ -329,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