fix vip.html levelName

Helius

2021-06-27 c55fea1e133ccd87a49f24f79e9e34e0813b1c38

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderRefundTask.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Component;

import java.io.IOException;
import java.util.List;

/**
 * 分销订单退款
@@ -44,23 +45,29 @@
        LogUtil.debug("收到分销订单退款任务orderId={}", orderId);
        QueryWrapper queryWrapper=new QueryWrapper();
        queryWrapper.eq("order_id",orderId);
        ShopSalesmanOrder shopSalesmanOrder = shopSalesmanOrderDao.selectOne(queryWrapper);
        if(shopSalesmanOrder!=null){
            shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_YTK);
            shopSalesmanOrderDao.updateById(shopSalesmanOrder);
        }else{
            LogUtil.debug("改订单为生成分销订单={}", orderId);
        }
        List<ShopSalesmanOrder> list = shopSalesmanOrderDao.selectList(queryWrapper);

        list.forEach(shopSalesmanOrder->{

            if(shopSalesmanOrder!=null){
                shopSalesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_YTK);
                shopSalesmanOrderDao.updateById(shopSalesmanOrder);
            }else{
                LogUtil.debug("改订单为生成分销订单={}", orderId);
            }


        });
        ShopOrder order=shopOrderDao.selectById(Integer.parseInt(orderId));

        //如果是积分支付则需要返还积分
        if(order.getScorePay()!=null && order.getScorePay()>0){
            LogUtil.debug("处理积分退款={}", orderId);
            scoreVipDetailService.refundScore(order.getUserId(),null,order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
            scoreVipDetailService.refundScore(order.getUserId(),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
        }

        //消费获得积分返还，如果本订单获得了积分则要扣除获得积分
        scoreVipDetailService.removeByBusinessId(order.getUserId(),null,Long.parseLong(order.getId()+""));
        scoreVipDetailService.removeByBusinessId(order.getUserId(),Long.parseLong(order.getId()+""));


    }