From 29a57ef19ba1a202d5923a9e356ed5863d26602c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 六月 2022 15:08:13 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java | 7 +++----
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WxCallbackApi.java | 18 +++++++++++++++---
2 files changed, 18 insertions(+), 7 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 20b0f6c..388647a 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
@@ -2,15 +2,19 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.panzhihua.applets.umf.UmfPayUtil;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.utlis.DateUtils;
+import io.swagger.annotations.ApiOperation;
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.web.bind.annotation.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -32,6 +36,8 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private UmfPayUtil umfPayUtil;
@PostMapping("wxNotify")
public void payCallback(HttpServletRequest request, HttpServletResponse response) {
@@ -168,4 +174,10 @@
e.printStackTrace();
}
}
+ @ApiOperation("uu洗车退款接口")
+ @GetMapping("/uuRepay")
+ public R uuRepay(@RequestParam("orderid") String orderid, @RequestParam("merdate") String merdate, @RequestParam("refundAmount")String refundAmount, @RequestParam("orgAmount")String orgAmount){
+ Map map=umfPayUtil.repay(orderid,merdate, DateUtils.getDateFormatString(new Date(),"yyMMddHHmmss")+"0001",refundAmount,orgAmount);
+ return R.ok(map);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
index a7e3381..fdacd7e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/umf/UmfPayUtil.java
@@ -25,8 +25,8 @@
Map respMap = instance.miniProgramPayMap(reqMapPublic);
return respMap;
}
- public Map repay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount){
- Map reqMapPublic=prepareRepay(orderid,merdate,amount,refundNo,refundAmount,orgAmount);
+ public Map repay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount){
+ Map reqMapPublic=prepareRepay(orderid,merdate,refundNo,refundAmount,orgAmount);
UmfService instance = new UmfServiceImpl("53461",file);
Map respMap=instance.generalRefundMap(reqMapPublic);
return respMap;
@@ -50,12 +50,11 @@
return reqMap;
}
//小程序支付请求参数
- public static Map prepareRepay(String orderid,String merdate,String amount,String refundNo,String refundAmount,String orgAmount) {
+ public static Map prepareRepay(String orderid,String merdate,String refundNo,String refundAmount,String orgAmount) {
Map reqMap = new HashMap();
reqMap.put("mer_id","53461");
reqMap.put("order_id",orderid);
reqMap.put("mer_date",merdate);
- reqMap.put("amount",amount);
reqMap.put("refund_no",refundNo);
reqMap.put("refund_amount",refundAmount);
reqMap.put("org_amount",orgAmount);
--
Gitblit v1.7.1