From fb86b8e265ca162bf670e015695f774853a2a111 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 11:16:49 +0800
Subject: [PATCH] Merge branch 'local_20221010' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 4 ----
1 files changed, 0 insertions(+), 4 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 a7edec1..ce443e9 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
@@ -161,12 +161,10 @@
@PostMapping("/uuRepay")
public R uuRepay(@RequestBody String aesString){
try {
- log.error("uuRepay接口调用 ---> start");
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);
Map map=umfPayUtil.repay(desMap.get("orderId"),desMap.get("merdate"), DateUtils.getDateFormatString(new Date(),"yyMMddHHmmss")+"0001",desMap.get("refundAmount"),desMap.get("orgAmount"));
- log.error("uuRepay接口调用 ---> end 订单号："+desMap.get("orderId"));
return R.ok(map);
} catch (Exception e) {
e.printStackTrace();
@@ -178,7 +176,6 @@
@PostMapping("/uuPush")
public R uuPush(@RequestBody String aesString){
try {
- log.error("uu洗车推送 ---> start");
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);
@@ -194,7 +191,6 @@
@PostMapping("/wsPush")
public R wsPush(@RequestBody String aesString){
try {
- log.error("ws洗车推送 ---> start");
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);
--
Gitblit v1.7.1