From b336c5495a574e597ced4a661ab12ffa49cb421a Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 12:44:39 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index c1b14d1..9b87c85 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -1,21 +1,13 @@
package com.ruoyi.order.service.impl.order;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.binarywang.wxpay.bean.ecommerce.*;
-import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingRequest.Receiver;
-import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult;
+import com.github.binarywang.wxpay.bean.ecommerce.RefundNotifyResult;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.google.common.base.Joiner;
-import com.google.gson.Gson;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -23,7 +15,6 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.order.config.WxPayConfiguration;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.account.OrderPayment;
import com.ruoyi.order.domain.pojo.account.OrderRefund;
@@ -54,7 +45,6 @@
import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
@@ -67,7 +57,6 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -132,8 +121,8 @@
@Autowired
private RedissonClient redissonClient;
- @Autowired
- private WxPayService wxService;
+ /*@Autowired
+ private WxPayService wxService;*/
@Resource
private PaymentMessageService paymentMessageService;
@@ -743,9 +732,9 @@
}
// 小程序微信下单支付
- createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), goodsName, orderNo,
+ /*createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), goodsName, orderNo,
orderId, order.getPayMoney(), appPlaceOrderDto.getOpenid(),
- appPlaceOrderDto.getSpbillCreateIp(), goodsNameList);
+ appPlaceOrderDto.getSpbillCreateIp(), goodsNameList);*/
//减去优惠券
@@ -782,7 +771,7 @@
* @param payerClientIp
* @param goodsNameList
*/
- private void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
+ /*private void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
String goodsName, String orderNo,
String orderId, BigDecimal payMoney,
String openid, String payerClientIp, List<String> goodsNameList){
@@ -857,7 +846,7 @@
} catch (WxPayException e) {
throw new ServiceException(e.getMessage());
}
- }
+ }*/
/**
@@ -1338,6 +1327,7 @@
merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
// 根据订单用户ID获取用户信息
Member member = remoteMemberService.getMember(order.getUserId()).getData();
+ merVerifyOrderVo.setUserId(order.getUserId());
merVerifyOrderVo.setUserName(member.getRealName());
merVerifyOrderVo.setUserMobile(member.getMobile());
merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
@@ -1480,6 +1470,7 @@
}
merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
Member member = remoteMemberService.getMember(order.getUserId()).getData();
+ merVerifyOrderVo.setUserId(order.getUserId());
merVerifyOrderVo.setUserName(member.getRealName());
merVerifyOrderVo.setUserMobile(member.getMobile());
merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
@@ -1497,12 +1488,12 @@
payRecord.setPayType(merVerifyOrderDto.getPayType());
payRecordService.save(payRecord);
- submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOrderMoney());
+ //submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOrderMoney());
return merVerifyOrderVo;
}
- private void submitProfitSharing(String orderId, String orderNo, Long shopId, BigDecimal orderMoney) {
+ /*private void submitProfitSharing(String orderId, String orderNo, Long shopId, BigDecimal orderMoney) {
String sendMessage = "";
String resultMessage = "";
try {
@@ -1577,7 +1568,7 @@
// 保存分账信息
paymentMessageService.savePaymentMessage("4", orderId, sendMessage, resultMessage);
- }
+ }*/
/**
* @param merVerifyCouponDto
@@ -3918,7 +3909,7 @@
BigDecimal onlinePayMoney = order.getOnlinePayMoney();
if(BigDecimal.ZERO.compareTo(onlinePayMoney) < 0){
// 订单支付金额大于0，可发起退款
- orderWxApplyRefund(orderId, refundId, onlinePayMoney, orderRefund);
+ //orderWxApplyRefund(orderId, refundId, onlinePayMoney, orderRefund);
}
orderRefund.setRefundStatus(1);
@@ -3928,7 +3919,7 @@
/**
* 申请退款API
*/
- private void orderWxApplyRefund(String orderId, String outRefundNo, BigDecimal payMoney, OrderRefund orderRefund){
+ /*private void orderWxApplyRefund(String orderId, String outRefundNo, BigDecimal payMoney, OrderRefund orderRefund){
try {
// 创建支付订单
OrderPayment orderPayment = orderPaymentService.getByOrderId(orderId);
@@ -3967,7 +3958,7 @@
} catch (WxPayException e) {
throw new ServiceException(e.getMessage());
}
- }
+ }*/
/**
* @param staffTotalDto
--
Gitblit v1.7.1