From 83dbfeab6fe421bf11b39429dca32469b8a1b9f8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 25 Sep 2021 18:44:44 +0800
Subject: [PATCH] 20210925
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 10 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 bbc4ff2..7ae82f7 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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.exception.FebsException;
@@ -12,8 +13,10 @@
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
+import cc.mrbird.febs.mall.service.MallMemberService;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
@@ -32,9 +35,7 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
/**
* @author wzy
@@ -55,6 +56,7 @@
private final MallOrderRefundMapper mallOrderRefundMapper;
private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
+ private final IApiMallMemberService memberService;
private final RedisUtils redisUtils;
@Override
@@ -113,6 +115,7 @@
mallOrderItemMapper.insert(orderItem);
sku.setStock(sku.getStock() - item.getCnt());
+ sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
mallGoodsSkuMapper.updateById(sku);
if (addOrderDto.getType() == 1) {
@@ -149,7 +152,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public String payOrder(PayOrderDto payOrderDto) {
+ public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
@@ -160,19 +163,38 @@
throw new FebsException("订单状态不能支付");
}
+ String orderNo = "";
switch (payOrderDto.getType()) {
case "1":
- // TODO 微信支付
+ orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+ orderInfo.setPayImage(payOrderDto.getPayImage());
+ orderInfo.setPayMethod("微信支付");
break;
case "2":
- // TODO 支付宝支付
+ orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+ orderInfo.setPayImage(payOrderDto.getPayImage());
+ orderInfo.setPayMethod("支付宝支付");
break;
case "3":
- return balancePay(orderInfo, payOrderDto.getTradePwd());
+ orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());
+
+ orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+ orderInfo.setPayMethod("积分支付");
default:
}
- return "";
+
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayResult("1");
+ this.baseMapper.updateById(orderInfo);
+
+ memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("orderNo", orderNo);
+ map.put("orderId", orderInfo.getId());
+ return map;
}
private String balancePay(MallOrderInfo orderInfo, String tradePwd) {
@@ -181,19 +203,27 @@
}
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
- if (!mallMember.getTradePassword().equals(SecureUtil.md5(tradePwd))) {
+
+ if (StrUtil.isBlank(mallMember.getTradePassword())) {
+ throw new FebsException("未设置支付密码");
+ }
+
+ if (!SecureUtil.md5(tradePwd).equals(mallMember.getTradePassword())) {
throw new FebsException("支付密码错误");
}
memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
+
return orderInfo.getOrderNo();
}
@Override
public List<OrderListVo> findOrderList(OrderListDto orderListDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
+ orderListDto.setMemberId(member.getId());
IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
}
@@ -270,10 +300,11 @@
throw new FebsException("已提交退款, 请勿重复提交");
}
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_PAY.getValue()) {
+ if (orderInfo.getStatus() != OrderStatusEnum.WAIT_SHIPPING.getValue() && orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) {
throw new FebsException("该订单不能退款");
}
+ Integer beforeStatus = orderInfo.getStatus();
MallMember member = LoginUserUtil.getLoginUser();
orderInfo.setStatus(OrderStatusEnum.REFUNDING.getValue());
this.baseMapper.updateById(orderInfo);
@@ -285,11 +316,17 @@
orderRefund.setMemberId(member.getId());
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
+ orderRefund.setType(addRefundDto.getType());
+ orderRefund.setRefundTime(new Date());
+ orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.insert(orderRefund);
} else {
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
+ orderRefund.setType(addRefundDto.getType());
+ orderRefund.setRefundTime(new Date());
+ orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.updateById(orderRefund);
}
@@ -313,6 +350,7 @@
orderRefund.setExpressNo(refundExpressDto.getExpressNo());
orderRefund.setExpressCom(refundExpressDto.getExpressCom());
+ orderRefund.setStatus(OrderRefundStatusEnum.EXPRESS_SUBMIT.getValue());
mallOrderRefundMapper.updateById(orderRefund);
MallOrderRefundOperation operation = new MallOrderRefundOperation();
--
Gitblit v1.9.1