20220822

xiaoyong931011

2022-08-30 08813f5797cef9d560766600bcded98b0a4aa1e1

20220822

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java

@@ -2,11 +2,15 @@

import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.service.IAdminMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
import cc.mrbird.febs.mall.vo.AdminRangeSettingVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -58,4 +62,29 @@
        model.addAttribute("memberId", id);
        return FebsUtil.view("modules/leader/addLeader");
    }


    /**
     * 团长每日分成
     * @param model
     * @return
     */
    @GetMapping("/leaderBonusSetting")
    public String deliverySetting(Model model) {
//        AdminRangeSettingVo adminRangeSettingVo = new AdminRangeSettingVo();
//        DataDictionaryCustom deliverySetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getType(), DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getCode());
//        if (ObjectUtil.isNotNull(deliverySetting)) {
//            adminRangeSettingVo.setHomeDeliveryAmount(Double.parseDouble(deliverySetting.getValue()));
//        }
//        DataDictionaryCustom rangeSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SWITCH.getType(), DataDictionaryEnum.RANGE_SWITCH.getCode());
//        if (ObjectUtil.isNotNull(rangeSwitch)) {
//            adminRangeSettingVo.setRangeSwitch(Integer.parseInt(rangeSwitch.getValue()));
//        }
//        DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
//        if (ObjectUtil.isNotNull(rangeSize)) {
//            adminRangeSettingVo.setRangeSize(Integer.parseInt(rangeSize.getValue()));
//        }
//        model.addAttribute("deliverySetting", adminRangeSettingVo);
        return FebsUtil.view("modules/goods/deliverySetting");
    }
}

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

@@ -303,54 +303,55 @@
            mallRefundEntity.setState(2);
            mallRefundEntity.setUpdatedTime(DateUtil.date());
            mallRefundMapper.updateById(mallRefundEntity);
        }
        //退款订单编号
        String orderNo = mallOrderInfo.getOrderNo();
        //退款退款编号
        String refundNo = mallRefundEntity.getRefundNo();
        //退款订单金额
        BigDecimal orderAmount = mallOrderInfo.getAmount();
        BigDecimal aa = new BigDecimal(100);
        int orderMoney = orderAmount.multiply(aa).intValue();
            return new FebsResponse().success().message("操作成功");
        }else{//退款订单编号
            String orderNo = mallOrderInfo.getOrderNo();
            //退款退款编号
            String refundNo = mallRefundEntity.getRefundNo();
            //退款订单金额
            BigDecimal orderAmount = mallOrderInfo.getAmount();
            BigDecimal aa = new BigDecimal(100);
            int orderMoney = orderAmount.multiply(aa).intValue();

        //退款退款金额
        BigDecimal refundAmount = mallRefundEntity.getAmount();
        BigDecimal bb = new BigDecimal(100);
        int refundMoney = refundAmount.multiply(bb).intValue();
            //退款退款金额
            BigDecimal refundAmount = mallRefundEntity.getAmount();
            BigDecimal bb = new BigDecimal(100);
            int refundMoney = refundAmount.multiply(bb).intValue();

        Boolean flag = false;
        Boolean debug = xcxProperties.getDebug();
        if (debug) {
            boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
            flag = b;
        } else {
            log.info("开始调用退款接口。。。退款编号为{}", refundNo);
            boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
            flag = b;
        }

        if(flag){
            //更新订单详情
            mallOrderItem.setState(3);
            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());

            List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
            if(CollUtil.isEmpty(mallOrderItemList)){
                MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
                mallOrderRefund.setStatus(6);
                mallOrderInfoMapper.updateById(mallOrderRefund);
            Boolean flag = false;
            Boolean debug = xcxProperties.getDebug();
            if (debug) {
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, 1, 1, null);
                flag = b;
            } else {
                log.info("开始调用退款接口。。。退款编号为{}", refundNo);
                boolean b = weixinServiceUtil.comRefund(orderNo, refundNo, orderMoney, refundMoney, null);
                flag = b;
            }
        }else{
            mallRefundEntity.setState(2);
            mallRefundMapper.updateById(mallRefundEntity);
            return new FebsResponse().fail().message("退款失败，请联系客服人员");

            if(flag){
                //更新订单详情
                mallOrderItem.setState(3);
                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());

                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
                if(CollUtil.isEmpty(mallOrderItemList)){
                    MallOrderInfo mallOrderRefund = mallOrderInfoMapper.selectById(orderId);
                    mallOrderRefund.setStatus(6);
                    mallOrderInfoMapper.updateById(mallOrderRefund);
                }
            }else{
                mallRefundEntity.setState(2);
                mallRefundMapper.updateById(mallRefundEntity);
                return new FebsResponse().fail().message("退款失败，请联系客服人员");
            }
            return new FebsResponse().success().message("退款成功");
        }
        return new FebsResponse().success().message("退款成功");
    }

    @Override