From fd97cde3d994a3aa6898ba862cd20d0c081012c3 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 18 六月 2024 18:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 4c496f4..55000ae 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -33,12 +33,14 @@
import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
import com.ruoyi.system.api.feignClient.AuctionClient;
import com.ruoyi.system.api.feignClient.MemberClient;
import com.ruoyi.system.api.feignClient.OrderClient;
import java.io.IOException;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.security.SignatureException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
@@ -78,14 +80,15 @@
private MemberClient memberClient;
@Override
- public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) {
+ public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
Double price = 0.0;
-
+ String subject;
+ String body;
try {
if(judgeContainsStr(orderNO)){
price= Double.valueOf(1);
- body = body;
- subject = subject;
+ body = " 订单支付";
+ subject = " 订单支付";
Map<String, Object> map = new HashMap<String, Object>();
if (type == 1) {
// 支付宝预下单
@@ -154,6 +157,7 @@
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
@@ -162,6 +166,13 @@
memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
+
}
@@ -261,6 +272,7 @@
wrapper1.eq(Order::getDelFlag,0);
Order page1 = OrderMapper.selectOne(wrapper1);
page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
@@ -270,6 +282,12 @@
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO);
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
@@ -393,15 +411,15 @@
AppPayReqData appPay = new AppPayReqData(apptype, (String) map.get("appid"), (String) map.get("mch_id"),
(String) map.get("prepay_id"), unifiedorderReqData.getNonce_str());
+ HashMap<String, Object> map1 = new HashMap<>();
+ map1.put("timeStamp", appPay.getTimestamp());
+ map1.put("nonceStr", appPay.getNoncestr());
+ map1.put("package", "prepay_id=" + appPay.getPrepayid());
+ map1.put("signType", "RSA");
+ map1.put("paySign", appPay.getSign());
+
// 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
- appPayMap.put("appid", appPay.getAppid());// 小程序ID
- appPayMap.put("nonceStr", appPay.getNoncestr());// 随机字符串(32位)
- appPayMap.put("package", appPay.get_package());// 扩展字段(暂填写固定值Sign=WXPay)
- appPayMap.put("partnerId", appPay.getPartnerid());// 商户号
- appPayMap.put("prepayId", appPay.getPrepayid());// 预支付编号（微信返回的支付交易会话ID）
- appPayMap.put("timeStamp", appPay.getTimestamp());// 时间戳
- appPayMap.put("sign", appPay.getSign());// 根据API给的签名规则进行签名
- return R.ok(appPayMap);
+ return R.ok(map1);
} catch (Exception e) {
System.out.println("统一下单_API_处理异常！");
e.printStackTrace();
--
Gitblit v1.7.1