From 31caa96bc740697c01812ec8382b492b309bab93 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 17:10:25 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 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 773f6c0..b81522d 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
@@ -6,6 +6,7 @@
 import cc.mrbird.febs.common.utils.AppContants;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.common.utils.MallUtils;
+import cc.mrbird.febs.common.utils.RedisUtils;
 import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
 import cc.mrbird.febs.mall.conversion.MallOrderRefundConversion;
 import cc.mrbird.febs.mall.dto.*;
@@ -54,13 +55,14 @@
     private final MallOrderRefundMapper mallOrderRefundMapper;
     private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
     private final MallShoppingCartMapper mallShoppingCartMapper;
+    private final RedisUtils redisUtils;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createOrder(AddOrderDto addOrderDto) {
         MallMember member = LoginUserUtil.getLoginUser();
 
-        MallAddressInfo address = mallAddressInfoMapper.selectById(addOrderDto.getAddressId());
+        MallAddressInfo address = mallAddressInfoMapper.selectAddressInfoByMemberIdAndId(member.getId(), addOrderDto.getAddressId());
         if (address == null) {
             throw new FebsException("地址不存在");
         }
@@ -111,6 +113,7 @@
             mallOrderItemMapper.insert(orderItem);
 
             sku.setStock(sku.getStock() - item.getCnt());
+            sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
             mallGoodsSkuMapper.updateById(sku);
 
             if (addOrderDto.getType() == 1) {
@@ -120,6 +123,9 @@
 
         orderInfo.setAmount(total);
         this.baseMapper.updateById(orderInfo);
+
+        String redisKey = StrUtil.format(AppContants.REDIS_ORDER_OVERTIME, member.getId(), orderInfo.getId());
+        redisUtils.set(redisKey, orderInfo.getId(), 900);
 
         return orderInfo.getId();
     }
@@ -176,19 +182,33 @@
         }
 
         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());
+
+        orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+        orderInfo.setPayTime(new Date());
+        orderInfo.setPayMethod("积分支付");
+        orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+        orderInfo.setPayResult("1");
+        this.baseMapper.updateById(orderInfo);
         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());
     }
@@ -265,10 +285,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);
@@ -280,11 +301,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);
         }
@@ -308,6 +335,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