From f3c03252d8f8a99013e10c1b898ce9af401e2e10 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Aug 2022 17:40:08 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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..fa7e82e 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,8 @@
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.AgreementPayDto;
+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;
@@ -38,6 +40,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -256,14 +259,14 @@
if("fail" == unipayStr){
throw new FebsException("支付失败");
}else{
- JSONUtil.parseObj(unipayStr);
+// 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());
+// agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
@@ -329,6 +332,49 @@
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());
+ agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
+ String agreementSignStr = unipayService.agreementSign(agreementSignDto);
+ if("fail" == agreementSignStr){
+ throw new FebsException("支付失败");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
+ payResultStr = (String) jsonObject.get("biz_code");
+ if("JS000000" != payResultStr){
+ throw new FebsException("支付失败");
+ }
+ }
+
+ AgreementPayDto agreementPayDto = new AgreementPayDto();
+ agreementPayDto.setOrderNo(orderInfo.getOrderNo());
+
+ BigDecimal value = orderInfo.getAmount().setScale(2, BigDecimal.ROUND_DOWN);
+ DecimalFormat decimalFormat = new DecimalFormat("0.00#");
+ String strVal = decimalFormat.format(value);
+ agreementPayDto.setOrderAmount(new BigDecimal(strVal));
+ agreementPayDto.setOrderTime(DateUtil.now());
+ List<MallOrderItem> itemsGoods = orderInfo.getItems();
+ if(CollUtil.isEmpty(itemsGoods)){
+ agreementPayDto.setOrderDesc("商品");
+ }else{
+ agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
+ }
+ agreementPayDto.setBankNo(payOrderDto.getBankNo());
+ String agreementPayStr = unipayService.agreementPay(agreementPayDto);
+
+ if("fail".equals(agreementSignStr)){
+ throw new FebsException("支付失败");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
+ payResultStr = (String) jsonObject.get("biz_code");
+ if(!"JS000000".equals(payResultStr)){
+ throw new FebsException("支付失败");
+ }
+ }
+ orderInfo.setPayMethod("快捷协议支付");
+ break;
default:
}
--
Gitblit v1.9.1