From 01fb2bd4b360caa4c97d18c8213efc56d40cfa57 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 14 Sep 2022 09:47:39 +0800
Subject: [PATCH] 20220902
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 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 0739eab..e288e53 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
@@ -73,6 +73,9 @@
private final IMallAchieveService mallAchieveService;
private final UnipayService unipayService;
+ private final MallMemberBankSignMapper mallMemberBankSignMapper;
+ private final MallMemberBankMapper mallMemberBankMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public Long createOrder(AddOrderDto addOrderDto) {
@@ -248,7 +251,7 @@
// unipayDto.setAmount(new BigDecimal("0.01"));
unipayDto.setAmount(orderInfo.getAmount());
unipayDto.setFrpCode("ALIPAY_H5");
- unipayDto.setTradeMerchantNo("777180800385820");
+ unipayDto.setTradeMerchantNo("777184100385821");
unipayDto.setOrderNo(orderInfo.getOrderNo());
List<MallOrderItem> items = orderInfo.getItems();
if(CollUtil.isEmpty(items)){
@@ -334,27 +337,27 @@
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".equals(agreementSignStr)){
- throw new FebsException("支付失败");
- }else{
- JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
- payResultStr = (String) jsonObject.get("biz_code");
- String signData = (String) jsonObject.get("data");
- String signBizMsg = (String) jsonObject.get("biz_msg");
-
- JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
- String err_msg = (String) signDatajsonObject.get("err_msg");
- if(!"JS000000".equals(payResultStr)){
- throw new FebsException(signBizMsg);
- }
- if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
- throw new FebsException(err_msg);
- }
- }
+// AgreementSignDto agreementSignDto = new AgreementSignDto();
+// agreementSignDto.setOrderNo(orderInfo.getOrderNo());
+// agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
+// String agreementSignStr = unipayService.agreementSign(agreementSignDto);
+// if("fail".equals(agreementSignStr)){
+// throw new FebsException("支付失败");
+// }else{
+// JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
+// payResultStr = (String) jsonObject.get("biz_code");
+// String signData = (String) jsonObject.get("data");
+// String signBizMsg = (String) jsonObject.get("biz_msg");
+//
+// JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+// String err_msg = (String) signDatajsonObject.get("err_msg");
+// if(!"JS000000".equals(payResultStr)){
+// throw new FebsException(signBizMsg);
+// }
+// if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+// throw new FebsException(err_msg);
+// }
+// }
AgreementPayDto agreementPayDto = new AgreementPayDto();
agreementPayDto.setOrderNo(orderInfo.getOrderNo());
@@ -370,10 +373,20 @@
}else{
agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
}
- agreementPayDto.setBankNo(payOrderDto.getBankNo());
+ Long bankId = payOrderDto.getBankId() == null ? 0L : payOrderDto.getBankId();
+ MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
+ if(ObjectUtil.isEmpty(mallMemberBank)){
+ throw new FebsException("银行卡未添加");
+ }
+ String bankNo = mallMemberBank.getBankNo();
+ MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(member.getId(), bankNo);
+ if(ObjectUtil.isEmpty(mallMemberBankSign)){
+ throw new FebsException("银行卡未签约");
+ }
+ agreementPayDto.setBankNo(bankNo);
String agreementPayStr = unipayService.agreementPay(agreementPayDto);
- if("fail".equals(agreementSignStr)){
+ if("fail".equals(agreementPayStr)){
throw new FebsException("支付失败");
}else{
JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
@@ -645,4 +658,17 @@
}
}
+ @Override
+ public FebsResponse bangCardSign(BangCardSignDto bangCardSignDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ Long memberId = member.getId();
+ String bankCard = bangCardSignDto.getBankCard();
+ MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(memberId,bankCard);
+ if(ObjectUtil.isNotEmpty(mallMemberBankSign)){
+ return new FebsResponse().success().data(mallMemberBankSign);
+ }else{
+ return new FebsResponse().success();
+ }
+ }
+
}
--
Gitblit v1.9.1