From 89c1c5d8ddca497df3094d84d307322e3a685bfd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 20 六月 2024 18:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 170 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 66 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 e6be77b..e585bc1 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
@@ -14,12 +14,15 @@
import com.jpay.weixin.api.WxPayApi;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.PointStatusEnum;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.Paylog;
+import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.mapper.OrderMapper;
import com.ruoyi.order.mapper.PaylogMapper;
+import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IPaylogService;
import com.ruoyi.order.util.MD5AndKL;
import com.ruoyi.order.util.SinataUtil;
@@ -31,6 +34,7 @@
import com.ruoyi.order.util.tencent.protocol.AppPayReqData;
import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData;
import com.ruoyi.system.api.domain.Order;
+import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.BondDTO;
import com.ruoyi.system.api.domain.dto.MemberPointsDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
@@ -50,6 +54,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.api.feignClient.OrderClient;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
@@ -71,8 +77,12 @@
@Resource
private AuctionClient auctionClient;
+
@Resource
private MemberClient memberClient;
+
+ @Resource
+ private OrderAuctionBondMapper orderAuctionBondMapper;
@Override
public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String orderNO,String openId, HttpServletRequest request) {
@@ -81,21 +91,39 @@
String body;
try {
if(judgeContainsStr(orderNO)){
- LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(Order::getOrderNo,orderNO);
- wrapper1.eq(Order::getDelFlag,0);
- Order page1 = OrderMapper.selectOne(wrapper1);
- price=page1.getTotalAmount().doubleValue();
- body = " 订单支付";
- subject = " 订单支付";
- Map<String, Object> map = new HashMap<String, Object>();
- if (type == 1) {
- // 支付宝预下单
- return this.alipay(orderNO, subject, body, price, request);
- } else {
- // 微信预下单
- return this.wxpay(2, orderNO, body,openId, price, request);
+ if (orderNO.contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,orderNO);
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one = orderAuctionBondMapper.selectOne(wrapper1);
+ price=one.getBond().doubleValue();
+ body = " 订单支付";
+ subject = " 订单支付";
+ if (type == 1) {
+ // 支付宝预下单
+ return this.alipay(orderNO, subject, body, price, request);
+ } else {
+ // 微信预下单
+ return this.wxpay(2, orderNO, body,openId, price, request);
+ }
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,orderNO);
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ price=page1.getTotalAmount().doubleValue();
+ body = " 订单支付";
+ subject = " 订单支付";
+ Map<String, Object> map = new HashMap<String, Object>();
+ if (type == 1) {
+ // 支付宝预下单
+ return this.alipay(orderNO, subject, body, price, request);
+ } else {
+ // 微信预下单
+ return this.wxpay(2, orderNO, body,openId, price, request);
+ }
}
+
}
} catch (Exception e) {
e.printStackTrace();
@@ -147,10 +175,15 @@
Paylog one = this.getOne(wrapper);
if(SinataUtil.isEmpty(one)) {
this.save(paylog1);
- BondDTO bondVO=new BondDTO();
- bondVO.setOrderNO(paylog1.getOutTradeNo());
- auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+ if (paylog1.getOutTradeNo().contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,paylog1.getOutTradeNo());
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ one1.setBoundStatus(BondStatusEnum.PAID);
+
+ }else{
LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo());
wrapper1.eq(Order::getDelFlag,0);
@@ -159,19 +192,19 @@
page1.setPayTime(LocalDateTime.now());
OrderMapper.updateById(page1);
- MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
- memberPointsDTO.setMemberId(page1.getMemberId());
- memberPointsDTO.setPointsType(1);
- 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);
-
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ 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,32 +294,35 @@
System.out.println("支付完成时间" + time_end);
paylog.setAddTime(LocalDateTime.now());
this.save(paylog);
- BondDTO bondVO=new BondDTO();
+ if (paylog.getOutTradeNo().contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ one1.setBoundStatus(BondStatusEnum.PAID);
- bondVO.setOrderNO(paylog.getOutTradeNo());
- auctionClient.UpdateBond(bondVO, SecurityConstants.INNER);
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED);
+ page1.setPayTime(LocalDateTime.now());
+ OrderMapper.updateById(page1);
- LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
- 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();
- memberPointsDTO.setMemberId(page1.getMemberId());
- memberPointsDTO.setPointsType(1);
- 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);
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ 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);
+ }
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
@@ -391,7 +427,7 @@
Map<String, Object> map1 = new HashMap<String, Object>();
Map<String, Object> appPayMap = new HashMap<String, Object>();
try {
- // 构建接口请求参数
+ /* // 构建接口请求参数
UnifiedorderReqData unifiedorderReqData = new UnifiedorderReqData(outTradeNo, body, price, Configure.wx_notify_url,
"JSAPI", openId);
// 请求接口获取返回接口
@@ -404,7 +440,7 @@
// 捕获预支付接口错误提示
if ("FAIL".equals(map1.get("result_code")) || "FAIL".equals(map1.get("return_code"))) {
return R.fail(String.valueOf(map1.get("return_msg")));
- }
+ }*/
/* // 对获取预支付返回接口参数进行封装（生成支付订单接口数据）
AppPayReqData appPay = new AppPayReqData(apptype, (String) map.get("appid"), (String) map.get("mch_id"),
@@ -416,27 +452,30 @@
// 创建hashmap(用户获得签名)
SortedMap<String, String> paraMap = new TreeMap<>();
//设置请求参数(小程序ID)
- paraMap.put("appid", unifiedorderReqData.getAppid());
+ paraMap.put("appid", Configure.getAppid());
//设置请求参数(商户号)
- paraMap.put("mch_id", unifiedorderReqData.getMch_id());
+ paraMap.put("mch_id", Configure.getMchid());
//设置请求参数(随机字符串)
paraMap.put("nonce_str", nonceStr);
//设置请求参数(商品描述)
- paraMap.put("body", unifiedorderReqData.getBody());
+ paraMap.put("body", body);
//设置请求参数(商户订单号)
- paraMap.put("out_trade_no", unifiedorderReqData.getOut_trade_no());
+ paraMap.put("out_trade_no", outTradeNo);
//设置请求参数(总金额)
- paraMap.put("total_fee", unifiedorderReqData.getTotal_fee().toString());
+
+ String money=SinataUtil.doubleRetainTwo(price*100d);
+ Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
+ paraMap.put("total_fee", price1.toString());
//设置请求参数(通知地址)
- paraMap.put("notify_url", unifiedorderReqData.getNotify_url());
+ paraMap.put("notify_url", Configure.wx_notify_url);
//设置请求参数(交易类型)
paraMap.put("trade_type", String.valueOf(WxPayApi.TradeType.JSAPI));
- paraMap.put("openid", unifiedorderReqData.getOpenid());
+ paraMap.put("openid",openId);
//设置请求参数(openid)(在接口文档中 该参数 是否必填项 但是一定要注意 如果交易类型设置成'JSAPI'则必须传入openid)
//MD5运算生成签名，这里是第一次签名，用于调用统一下单接口
- String sign = PaymentKit.createSign(paraMap, "E10ADC3949BA59ABBE56E057F20F883E");
+ String sign = PaymentKit.createSign(paraMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh");
paraMap.put("sign", sign);
//统一下单,向微信api发送数据
//转成xml
@@ -448,7 +487,6 @@
//返回给小程序端需要的参数
Map<String, Object> returnMap = new HashMap<>(20);
-
String prepay_id = map.get("prepay_id");
//重新进行签名后返回给前端
returnMap.put("appId", map.get("appid"));
@@ -456,7 +494,7 @@
returnMap.put("package", "prepay_id=" + prepay_id);
returnMap.put("timeStamp", new Date().getTime() + "");
returnMap.put("signType", "MD5");
- String signature = weixinSignature(returnMap, "E10ADC3949BA59ABBE56E057F20F883E");
+ String signature = weixinSignature(returnMap, "HSCEWrfSYiwxR6sesZ6De91Xh3m447sh");
returnMap.put("prepay_id", prepay_id);
returnMap.put("mch_id", map.get("mch_id"));
--
Gitblit v1.7.1