20220822

xiaoyong931011

2022-08-30 ce6fc16f568cc3c396e141f1f9a7e16d3abf802d

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java

@@ -23,6 +23,7 @@
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -284,6 +285,7 @@
        //获取退款订单信息
        Long orderId = apiLeaderRefundOrderDto.getOrderId();
        Long itemId = apiLeaderRefundOrderDto.getItemId();

        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
        List<MallRefundEntity> mallRefundEntities = mallRefundMapper.selectByItemIdAndOrderIdAndState(itemId, orderId, 3);
@@ -291,6 +293,17 @@
            return new FebsResponse().fail().message("退款失败，请联系客服人员");
        }
        MallRefundEntity mallRefundEntity = mallRefundEntities.get(0);

        Integer agreeState = apiLeaderRefundOrderDto.getAgreeState() == null? 2:apiLeaderRefundOrderDto.getAgreeState();
        if(2 == agreeState){
            //更新订单详情
            mallOrderItem.setState(1);
            mallOrderItemMapper.updateById(mallOrderItem);
            //更新退款订单
            mallRefundEntity.setState(2);
            mallRefundEntity.setUpdatedTime(DateUtil.date());
            mallRefundMapper.updateById(mallRefundEntity);
        }
        //退款订单编号
        String orderNo = mallOrderInfo.getOrderNo();
        //退款退款编号
@@ -322,6 +335,7 @@
            mallOrderItemMapper.updateById(mallOrderItem);
            //更新退款订单
            mallRefundEntity.setState(1);
            mallRefundEntity.setUpdatedTime(DateUtil.date());
            mallRefundMapper.updateById(mallRefundEntity);
            mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());