From df18a89ffc1c97884207897f3876602f2addecdb Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:45:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/NotifyController.java | 33 ++--------------
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java | 13 ++----
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 39 +++++++------------
3 files changed, 22 insertions(+), 63 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
index 9cd9524..f5339cd 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/config/WxPayConfiguration.java
@@ -1,14 +1,9 @@
package com.ruoyi.order.config;
-import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
@@ -29,10 +24,10 @@
return PLATFORM_TY_MAC_ID;
}
- @Bean
+ /*@Bean
@ConditionalOnMissingBean
public WxPayService wxService() {
- WxPayConfig payConfig = new WxPayConfig();
+ *//*WxPayConfig payConfig = new WxPayConfig();
payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
@@ -48,7 +43,7 @@
WxPayService wxPayService = new WxPayServiceImpl();
wxPayService.setConfig(payConfig);
- return wxPayService;
- }
+ return wxPayService;*//*
+ }*/
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/NotifyController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/NotifyController.java
index 775d9da..07a4a0f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/NotifyController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/NotifyController.java
@@ -1,34 +1,9 @@
package com.ruoyi.order.controller.miniapp;
-import com.github.binarywang.wxpay.bean.ecommerce.*;
-import com.github.binarywang.wxpay.bean.notify.WxPayNotifyV3Response;
-import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyData;
-import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.ProfitSharingV3Service;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.v3.auth.Verifier;
-import com.github.binarywang.wxpay.v3.util.AesUtils;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.order.domain.vo.ProfitSharingNotifyNewResult;
-import com.ruoyi.order.enums.WxPayNotifyEventTypeEnum;
-import com.ruoyi.order.service.account.BackMessageService;
-import com.ruoyi.order.service.order.OrderService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.util.Map;
-import java.util.Objects;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @program: ruoyi
@@ -41,7 +16,7 @@
@RequestMapping("/app/notify")
public class NotifyController extends BaseController {
- public static final String WECHAT_PAY_SERIAL = "Wechatpay-Serial";
+ /*public static final String WECHAT_PAY_SERIAL = "Wechatpay-Serial";
public static final String WECHAT_PAY_SIGNATURE = "Wechatpay-Signature";
public static final String WECHAT_PAY_TIMESTAMP = "Wechatpay-Timestamp";
public static final String WECHAT_PAY_NONCE = "Wechatpay-Nonce";
@@ -169,5 +144,5 @@
signatureHeader.setNonce(response.getHeader(WECHAT_PAY_NONCE));
signatureHeader.setTimeStamp(response.getHeader(WECHAT_PAY_TIMESTAMP));
return signatureHeader;
- }
+ }*/
}
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 2155f03..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());
}
- }
+ }*/
/**
@@ -1499,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 {
@@ -1579,7 +1568,7 @@
// 保存分账信息
paymentMessageService.savePaymentMessage("4", orderId, sendMessage, resultMessage);
- }
+ }*/
/**
* @param merVerifyCouponDto
@@ -3920,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);
@@ -3930,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);
@@ -3969,7 +3958,7 @@
} catch (WxPayException e) {
throw new ServiceException(e.getMessage());
}
- }
+ }*/
/**
* @param staffTotalDto
--
Gitblit v1.7.1