From 1a6a034373a07c5ce7b5a442b7ddf5842fc4e7b4 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Tue, 30 Aug 2022 14:40:00 +0800 Subject: [PATCH] 20220822 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 15 ++++++++++++--- 1 files changed, 12 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 b213d54..20b1a19 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 @@ -127,6 +127,7 @@ orderItem.setStyleName(mallGoods.getGoodsName()); orderItem.setSkuName(mallGoods.getGoodsName()); orderItem.setSkuImage(mallGoods.getThumb()); + orderItem.setState(1); total = total.add(amount); } else { @@ -161,6 +162,7 @@ orderItem.setGoodsId(sku.getGoodsId()); orderItem.setGoodsName(sku.getGoodsName()); orderItem.setSkuId(sku.getId()); + orderItem.setState(1); orderItem.setStyleName(sku.getStyleName()); orderItem.setSkuName(sku.getSkuName()); orderItem.setSkuImage(sku.getSkuImage()); @@ -749,9 +751,17 @@ return new FebsResponse().fail().message("该订单无法申请退款"); } - MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId); MallRefundEntity mallRefundEntity = new MallRefundEntity(); - mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+itemId); + MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId); + if(ObjectUtil.isNotEmpty(mallOrderItem)){ + mallOrderItem.setState(2); + mallOrderItemMapper.updateById(mallOrderItem); + mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+itemId); + mallRefundEntity.setItemId(itemId); + }else{ + + mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_R"+orderId); + } mallRefundEntity.setRefundReason(applyRefundOrderDto.getRefundReason()); mallRefundEntity.setRefundRemark(applyRefundOrderDto.getRefundRemark()); mallRefundEntity.setRefundPic(applyRefundOrderDto.getRefundPic()); @@ -759,7 +769,6 @@ mallRefundEntity.setState(3); mallRefundEntity.setType(1); mallRefundEntity.setOrderId(orderId); - mallRefundEntity.setItemId(itemId); mallRefundEntity.setAmount(mallOrderItem.getAmount()); mallRefundMapper.insert(mallRefundEntity); return new FebsResponse().success().message("已申请"); -- Gitblit v1.9.1