From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index ef78c15..67034b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -3,16 +3,19 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+
+import com.alibaba.fastjson.JSONObject;
import com.panzhihua.applets.config.MinioUtil;
import com.panzhihua.applets.umf.UmfPayUtil;
-import com.panzhihua.applets.unionpay.Refund;
-import com.panzhihua.applets.unionpay.UnifiedOrder;
+import com.panzhihua.applets.unionpay.*;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.wx.UnionpayCarWash;
import com.panzhihua.common.model.vos.community.Base64File;
import com.panzhihua.common.utlis.*;
import net.coobird.thumbnailator.Thumbnails;
@@ -39,6 +42,7 @@
import lombok.extern.slf4j.Slf4j;
import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed;
+import static com.panzhihua.common.utlis.PayUtil.makeUUID;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -255,33 +259,61 @@
@ApiOperation("uu洗车银联下单接口")
@GetMapping("/uuUnionpayPay")
- public R uuUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
- String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId);
+ public R uuUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
return R.ok(map);
}
@ApiOperation("无水洗车银联下单接口")
@GetMapping("/wsUnionpayPay")
- public R wsUnionpayPay(@RequestParam("amount")String amount,@RequestParam("productId")String productId){
- String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId);
+ public R wsUnionpayPay(@RequestParam("amount")String amount,
+ @RequestParam("productId")String productId,
+ @RequestParam("openId")String openId){
+ LocalDateTime time=DateUtils.getCurrentDate();
+ String merOrderId= UnionpayContent.TOP4+time.format(DateUtils.format_ymdhms_yyyyMMddmmHHssSSS)+makeUUID(7);
+ String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,openId,time,merOrderId);
+ communityService.add(productId,merOrderId,amount);
return R.ok(map);
}
@ApiOperation("uu洗车银联退款接口")
@GetMapping("/uuUnionpayRefund")
- public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
+ public R uuUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
String map= Refund.sendOrder(refundAmount,refundOrderId);
return R.ok(map);
}
@ApiOperation("无水洗车银联退款接口")
@GetMapping("/wsUnionpayRefund")
- public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,@RequestParam("refundOrderId")String refundOrderId){
+ public R wsUnionpayRefundPay(@RequestParam("refundAmount")String refundAmount,
+ @RequestParam("refundOrderId")String refundOrderId){
String map= Refund.sendOrder(refundAmount,refundOrderId);
return R.ok(map);
}
+ @ApiOperation("银联支付查询接口")
+ @GetMapping("/unionpayQuery")
+ public R unionpayRefundPay(@RequestParam("merOrderId")String merOrderId){
+ String map= Query.query(merOrderId);
+ return R.ok(map);
+ }
+
+ @ApiOperation("银联退款查询接口")
+ @GetMapping("/unionpayRefundQuery")
+ public R unionpayRefundQuery(@RequestParam("merOrderId")String merOrderId){
+ String map= RefundQuery.refundQuery(merOrderId);
+ return R.ok(map);
+ }
+
+
--
Gitblit v1.7.1