From bad4cadc4c4bc735e97247918a0555bfc1278798 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 24 Oct 2023 17:19:08 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 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 f979cc0..1d3a04c 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
@@ -19,8 +19,8 @@
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.AliIPayService;
import cc.mrbird.febs.pay.service.IPayService;
import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
@@ -37,7 +37,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -70,7 +69,7 @@
private final RedisUtils redisUtils;
private final AgentProducer agentProducer;
- private final IPayService payService;
+ private final AliIPayService payService;
private final IMallAchieveService mallAchieveService;
private final MallAchieveRecordMapper mallAchieveRecordMapper;
private final UnipayService unipayService;
@@ -78,6 +77,8 @@
private final MallMemberBankSignMapper mallMemberBankSignMapper;
private final MallMemberBankMapper mallMemberBankMapper;
private final MallShopApplyMapper mallShopApplyMapper;
+ private final IPayService wechatPayService;
+ private final ICommonService commonService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -214,7 +215,6 @@
}
this.baseMapper.updateById(orderInfo);
- agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
return orderInfo.getId();
}
@@ -261,32 +261,45 @@
String rcResult = "";
switch (payOrderDto.getType()) {
case "1":
- UnipayDto unipayDtoWx = new UnipayDto();
-// unipayDto.setAmount(new BigDecimal("0.01"));
- unipayDtoWx.setAmount(orderInfo.getAmount());
- unipayDtoWx.setFrpCode("WEIXIN_APP3");
- unipayDtoWx.setTradeMerchantNo("777180800385820");
- unipayDtoWx.setOrderNo(orderInfo.getOrderNo());
List<MallOrderItem> itemsWx = orderInfo.getItems();
if(CollUtil.isEmpty(itemsWx)){
- unipayDtoWx.setProductName("商品");
+ orderInfo.setName("商品");
}else{
- unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
+ orderInfo.setName(itemsWx.get(0).getGoodsName());
}
- String unipayStrWx = unipayService.unipay(unipayDtoWx);
- if("fail" == unipayStrWx){
- throw new FebsException("支付失败");
- }else{
-// JSONUtil.parseObj(unipayStr);
- JSONObject jsonObject = JSONUtil.parseObj(unipayStrWx);
- payResultStr = (String) jsonObject.get("r7_TrxNo");
- rcResult = (String) jsonObject.get("rc_Result");
- }
+
+ payResultStr = wechatPayService.pay(orderInfo);
orderInfo.setPayOrderNo(payResultStr);
-// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
-// orderInfo.setPayImage(payOrderDto.getPayImage());
orderInfo.setPayMethod("微信支付");
+ orderInfo.setPayResult("2");
break;
+// case "1":
+// UnipayDto unipayDtoWx = new UnipayDto();
+//// unipayDto.setAmount(new BigDecimal("0.01"));
+// unipayDtoWx.setAmount(orderInfo.getAmount());
+// unipayDtoWx.setFrpCode("WEIXIN_APP3");
+// unipayDtoWx.setTradeMerchantNo("777180800385820");
+// unipayDtoWx.setOrderNo(orderInfo.getOrderNo());
+// List<MallOrderItem> itemsWx = orderInfo.getItems();
+// if(CollUtil.isEmpty(itemsWx)){
+// unipayDtoWx.setProductName("商品");
+// }else{
+// unipayDtoWx.setProductName(itemsWx.get(0).getGoodsName());
+// }
+// String unipayStrWx = unipayService.unipay(unipayDtoWx);
+// if("fail" == unipayStrWx){
+// throw new FebsException("支付失败");
+// }else{
+//// JSONUtil.parseObj(unipayStr);
+// JSONObject jsonObject = JSONUtil.parseObj(unipayStrWx);
+// payResultStr = (String) jsonObject.get("r7_TrxNo");
+// rcResult = (String) jsonObject.get("rc_Result");
+// }
+// orderInfo.setPayOrderNo(payResultStr);
+//// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+//// orderInfo.setPayImage(payOrderDto.getPayImage());
+// orderInfo.setPayMethod("微信支付");
+// break;
case "2":
// if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
// payResultStr = orderInfo.getPayOrderNo();
@@ -329,12 +342,9 @@
this.baseMapper.updateById(orderInfo);
//新增业绩，第一次购买套餐则升级用户为普通会员
- addAchieveAndUpdateLevel(orderInfo.getId(),member.getId());
+ commonService.addAchieveAndUpdateLevel(orderInfo.getId(),orderInfo.getMemberId());
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
- agentProducer.sendAutoLevelUpMsg(member.getId());
-// agentProducer.sendOrderReturn(orderInfo.getId());
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -460,6 +470,10 @@
mallAchieveRecord.setIsNormal(2);
mallAchieveRecord.setPayTime(orderInfo.getPayTime());
mallAchieveRecordMapper.insert(mallAchieveRecord);
+ //得到三倍补助
+// BigDecimal multiply = achieveAmount.multiply(new BigDecimal(3));
+// memberWalletService.add(multiply, memberId, "commission");
+
}
if(member.getLevel().equals(MemberLevelEnum.FANS.getType())){
member.setLevel(MemberLevelEnum.NORMAL.getType());
--
Gitblit v1.9.1