From 851eec958dc8f8998578a03079627977c0c5c321 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 23 十月 2023 14:53:19 +0800
Subject: [PATCH] 对接第三方分账接口
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 edb5db2..f686694 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
@@ -1229,7 +1229,12 @@
}
appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
// 小程序微信下单支付
- createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), orderGoods.getGoodsName(), outTradeNo,
+// createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), orderGoods.getGoodsName(), outTradeNo,
+// orderId, order.getPayMoney(), appPlaceActivityDto.getOpenid(),
+// appPlaceActivityDto.getSpbillCreateIp());
+
+ // 小程序微信下单支付 TODO 更换支付渠道（汇付天下）
+ createWxPayInfo1(appPlaceOrderVo, userId, order.getShopId(), orderGoods.getGoodsName(), outTradeNo,
orderId, order.getPayMoney(), appPlaceActivityDto.getOpenid(),
appPlaceActivityDto.getSpbillCreateIp());
//生成自动取消订单延时任务
@@ -1507,11 +1512,6 @@
Order order = this.getById(orderId);
if (order.getOrderStatus() != 2) {
throw new ServiceException(AppErrorConstant.VERIFY_USED);
- }
- //判断商户是否有分账权限
- Shop shop = remoteShopService.getShop(shopId).getData();
- if(shop.getAccountFlag()!=1){
- throw new ServiceException(AppErrorConstant.SHOP_NO_VERIFY);
}
// 根据订单用户ID获取用户信息
Member member = remoteMemberService.getMember(order.getUserId()).getData();
@@ -2046,6 +2046,8 @@
OrderPayment payment = orderPaymentService.getByOrderId(orderId);
String transactionId = payment.getTransactionId();
String outTradeNo = payment.getOutTradeNo();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+ String org_req_date = sdf.format(payment.getCreateTime());
R<ShopAuthenticationHftxVo> resultMch = remoteShopService.getShopHFTXSubMchId(shopId);
ShopAuthenticationHftxVo vo = resultMch.getData();
if (StringUtils.isEmpty(vo.getHuifuId())) {
@@ -2059,7 +2061,11 @@
BigDecimal proportionPercent = null;
//商户订单获取统一分成 活动订单获取活动分成
if(orderFrom==1){
- proportionPercent = new BigDecimal(vo.getShareRatio());
+ if(null == vo.getShareRatio()){
+ proportionPercent = new BigDecimal(redisService.getCacheObject(SecurityConstant.SHOP_COMMON_PROPORTION).toString());
+ }else{
+ proportionPercent = new BigDecimal(vo.getShareRatio());
+ }
}else{
R<ShopProportionVo> resultShopProportion = remoteShopService.getShopProportion(shopId);
shopProportion = resultShopProportion.getData();
@@ -2097,13 +2103,14 @@
JSONObject jsonObject = new JSONObject();
jsonObject.put("div_amt", String.format("%.2f", multiply.doubleValue()));
jsonObject.put("huifu_id", vo.getHuifuId());
+ acctInfos.add(jsonObject);
//平台商户
double pt_amount = orderMoney.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("div_amt", String.format("%.2f", pt_amount));
jsonObject1.put("huifu_id", "6666000141216769");
acctInfos.add(jsonObject1);
- R<PaymentDelaytransHFTXVo> hftxVoR = HuiFuTianXiaUtil.paymentDelaytrans(request.getOutOrderNo(), outTradeNo, acctInfos);
+ R<PaymentDelaytransHFTXVo> hftxVoR = HuiFuTianXiaUtil.paymentDelaytrans(request.getOutOrderNo(), org_req_date, outTradeNo, acctInfos);
if(hftxVoR.getCode() != 200){
throw new ServiceException(hftxVoR.getMsg());
}
@@ -2124,6 +2131,7 @@
log.info(resultMessage);
}
} catch (Exception e) {
+ e.printStackTrace();
resultMessage = String.format("订单分账：%s 分账失败：%s", orderNo, e.getMessage());
log.info(resultMessage);
throw new ServiceException(resultMessage);
--
Gitblit v1.7.1