fix

Hentua

2023-08-24 d647da057b17debf32c17f565f119bf7c2520e19

fix

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

@@ -21,6 +21,7 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.service.IApiMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.AdminAddAddressTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderRefundAddressVo;
import cc.mrbird.febs.pay.model.OrderStateDto;
@@ -66,6 +67,8 @@
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final RedisUtils redisUtils;

    private final IApiMallTeamLeaderService apiMallTeamLeaderService;



@@ -186,6 +189,16 @@
    }

    /**
     * 退款操作
     * @return
     */
    @PostMapping(value = "/refundOperation")
    @ControllerEndpoint(operation = "订单退款", exceptionMessage = "操作失败")
    public FebsResponse refundOperation(ApiLeaderRefundOrderDto apiLeaderRefundOrderDto) {
        return apiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
    }

    /**
     * 订单退款-退款确认
     *
     * @param id

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

@@ -453,8 +453,7 @@
            sku.setSkuImage(mallGoods.getThumb());
            sku.setSkuName(mallGoods.getGoodsName());
            sku.setCostPrice(mallGoods.getCostPrice());
//            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
            sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
            sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());

 src/main/resources/mapper/modules/MallRefundMapper.xml

@@ -28,6 +28,7 @@
               b.order_time orderTime,
               b.order_no orderNo,
               b.status,
               c.id itemId,
               c.goods_name goodsName,
               c.cnt,
               d.name refundMemberName,

 src/main/resources/templates/febs/views/modules/order/orderRefundList.html

@@ -119,6 +119,30 @@
                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
                    });
                    break;
                case 'agree':
                    var objReq = {};
                    objReq.orderId = data.orderId;
                    objReq.itemId = data.itemId;
                    objReq.agreeState = 1
                    febs.modal.confirm('订单退款', '是否同意订单退款？', function () {
                        febs.post(ctx + 'admin/order/refundOperation', objReq, function () {
                            febs.alert.success('操作成功');
                            $('#febs-order-refund').find('#reset').click();
                        });
                    });
                    break;
                case 'disagree':
                    var objReq = {};
                    objReq.orderId = data.orderId;
                    objReq.itemId = data.itemId;
                    objReq.agreeState = 2;
                    febs.modal.confirm('订单退款', '是否拒绝订单退款？', function () {
                        febs.post(ctx + 'admin/order/refundOperation', objReq, function () {
                            febs.alert.success('操作成功');
                            $('#febs-order-refund').find('#reset').click();
                        });
                    });
                    break;

            }
        });
@@ -165,6 +189,16 @@
                    {field: 'refundReason', title: '退款原因', minWidth: 150,align:'left'},
                    {field: 'refundRemark', title: '退款说明', minWidth: 150,align:'left'},
                    {field: 'refundPicList', title: '退款图片', templet: '#refundPicItem', minWidth: 200,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            if(d.state === 3){
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree">同意</button>'
                                    +'<button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="disagree">拒绝</button>'
                            } else {
                                return '';
                            }

                        },minWidth: 200,align:'center'}
                ]]
            });
        }