From 1fbe48667e43005ce6883ae6df20a9ff59809af7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Aug 2023 15:47:04 +0800
Subject: [PATCH] jufu商城
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java | 7 ++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 80 ++++++++++++++++++++--------------------
2 files changed, 44 insertions(+), 43 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 d23ad06..3d72e8b 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
@@ -296,49 +296,49 @@
orderInfo.setPayResult("2");
break;
case "2":
- LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
- //订单编号
- laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
- //订单金额，分计
- laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
- List<MallOrderItem> itemsLKL = orderInfo.getItems();
- //商品名称
- if(CollUtil.isEmpty(itemsLKL)){
- laKaLaCreateOrderReqDate.setOrder_info("商品");
+// LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
+// //订单编号
+// laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
+// //订单金额，分计
+// laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
+// List<MallOrderItem> itemsLKL = orderInfo.getItems();
+// //商品名称
+// if(CollUtil.isEmpty(itemsLKL)){
+// laKaLaCreateOrderReqDate.setOrder_info("商品");
+// }else{
+// laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
+// }
+// payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
+// JSONObject parseObj = JSONUtil.parseObj(payResultStr);
+// String code = parseObj.get("code").toString();
+// if (!"true".equals(code)) {
+// throw new FebsException("跳转收银台失败");
+// }
+//
+// orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
+// orderInfo.setPayMethod("拉卡拉支付");
+// orderInfo.setPayResult("2");
+ UnipayDto unipayDto = new UnipayDto();
+ unipayDto.setAmount(orderInfo.getAmount());
+ unipayDto.setFrpCode("ALIPAY_H5");
+ unipayDto.setTradeMerchantNo("777184100385821");
+ unipayDto.setOrderNo(orderInfo.getOrderNo());
+ List<MallOrderItem> items = orderInfo.getItems();
+ if(CollUtil.isEmpty(items)){
+ unipayDto.setProductName("商品");
}else{
- laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
+ unipayDto.setProductName(items.get(0).getGoodsName());
}
- payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
- JSONObject parseObj = JSONUtil.parseObj(payResultStr);
- String code = parseObj.get("code").toString();
- if (!"true".equals(code)) {
- throw new FebsException("跳转收银台失败");
+ String unipayStr = unipayService.unipay(unipayDto);
+ if("fail" == unipayStr){
+ throw new FebsException("支付失败");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
+ payResultStr = (String) jsonObject.get("r7_TrxNo");
+ rcResult = (String) jsonObject.get("rc_Result");
}
-
- orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
- orderInfo.setPayMethod("拉卡拉支付");
- orderInfo.setPayResult("2");
-// UnipayDto unipayDto = new UnipayDto();
-// unipayDto.setAmount(orderInfo.getAmount());
-// unipayDto.setFrpCode("ALIPAY_H5");
-// unipayDto.setTradeMerchantNo("777184100385821");
-// unipayDto.setOrderNo(orderInfo.getOrderNo());
-// List<MallOrderItem> items = orderInfo.getItems();
-// if(CollUtil.isEmpty(items)){
-// unipayDto.setProductName("商品");
-// }else{
-// unipayDto.setProductName(items.get(0).getGoodsName());
-// }
-// String unipayStr = unipayService.unipay(unipayDto);
-// if("fail" == unipayStr){
-// throw new FebsException("支付失败");
-// }else{
-// JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
-// payResultStr = (String) jsonObject.get("r7_TrxNo");
-// rcResult = (String) jsonObject.get("rc_Result");
-// }
-// orderInfo.setPayOrderNo(payResultStr);
-// orderInfo.setPayMethod("支付宝支付");
+ orderInfo.setPayOrderNo(payResultStr);
+ orderInfo.setPayMethod("支付宝支付");
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
index bd6b9b0..2904bae 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMemberWithdrawServiceImpl.java
@@ -47,6 +47,7 @@
private final MallMemberPaymentMapper mallMemberPaymentMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallMemberAlipayMapper mallMemberAlipayMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -91,9 +92,9 @@
throw new FebsException("最小提现金额为"+cashOutSettingVo.getMinCashOut().setScale(2,BigDecimal.ROUND_DOWN));
}
- MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
+ MallMemberAlipay mallMemberAlipay = mallMemberAlipayMapper.selectById(withdrawalDto.getBankId());
// MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(withdrawalDto.getBankId());
- if(ObjectUtil.isEmpty(mallMemberBank)){
+ if(ObjectUtil.isEmpty(mallMemberAlipay)){
throw new FebsException("未找到支付宝信息");
}
// if(ObjectUtil.isEmpty(mallMemberBank.getBankName())){
@@ -172,7 +173,7 @@
withdraw.setStatus(1);
withdraw.setAmountFee(serviceFee);
withdraw.setRemark(remark);
- withdraw.setWtihdrawTypeId(mallMemberBank.getId());
+ withdraw.setWtihdrawTypeId(mallMemberAlipay.getId());
this.baseMapper.insert(withdraw);
mallMemberService.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1, FlowTypeEnum.BALANCE.getValue());
--
Gitblit v1.9.1