From d28d43e9ababfa4c2a91e405702c1fffe18c46cd Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 18:04:15 +0800
Subject: [PATCH] 修改杨家坪社区问题
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 d2778b3..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,18 +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.Query;
-import com.panzhihua.applets.unionpay.Refund;
-import com.panzhihua.applets.unionpay.RefundQuery;
-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;
@@ -41,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
@@ -260,7 +262,11 @@
public R uuUnionpayPay(@RequestParam("amount")String amount,
@RequestParam("productId")String productId,
@RequestParam("openId")String openId){
- String map= UnifiedOrder.sendOrder(amount,"uu洗车下单",productId,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);
}
@@ -269,7 +275,10 @@
public R wsUnionpayPay(@RequestParam("amount")String amount,
@RequestParam("productId")String productId,
@RequestParam("openId")String openId){
- String map= UnifiedOrder.sendOrder(amount,"无水洗车下单",productId,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);
}
--
Gitblit v1.7.1