From e49a408a275464cfb4718f8af35604f13767f585 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Aug 2022 15:38:48 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 1deb5c2..2f2ff02 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -17,6 +17,7 @@
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UnipayDto;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.UnipayService;
@@ -263,7 +264,7 @@
}
orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
- agentProducer.sendOrderReturn(orderInfo.getId());
+// agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
@@ -329,6 +330,35 @@
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
break;
+ case "5":
+ AgreementSignDto agreementSignDto = new AgreementSignDto();
+ agreementSignDto.setOrderNo(orderInfo.getOrderNo());
+ unipayService.agreementSign(agreementSignDto);
+// UnipayDto unipayDto = new UnipayDto();
+//// unipayDto.setAmount(new BigDecimal("0.01"));
+// unipayDto.setAmount(orderInfo.getAmount());
+// unipayDto.setFrpCode("ALIPAY_H5");
+// unipayDto.setTradeMerchantNo("777180800385820");
+// unipayDto.setOrderNo(orderInfo.getOrderNo());
+// List<MallOrderItem> items = orderInfo.getItems();
+// if(CollUtil.isEmpty(items)){
+// unipayDto.setProductName("商品");
+// }else{
+// unipayDto.setProductName(items.get(0).getGoodsName());
+// }
+// String agreementSignStr = "";
+// if("fail" == unipayStr){
+// throw new FebsException("支付失败");
+// }else{
+// JSONUtil.parseObj(unipayStr);
+// JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
+// payResultStr = (String) jsonObject.get("r7_TrxNo");
+// rcResult = (String) jsonObject.get("rc_Result");
+// }
+ orderInfo.setPayOrderNo(payResultStr);
+ orderInfo.setPayMethod("支付宝支付");
+// agentProducer.sendOrderReturn(orderInfo.getId());
+ break;
default:
}
--
Gitblit v1.9.1