src/main/java/cc/mrbird/febs/mall/controller/order/AdminMallOrderController.java
@@ -353,6 +353,12 @@ ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true); return null; } @GetMapping("refundOrder") @ControllerEndpoint(operation = "后台退货", exceptionMessage = "操作失败") public FebsResponse confirmOrder(AdminRefundOrderDto dto){ return adminMallOrderService.confirmOrder(dto); } @GetMapping("confirmOrder") @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败") src/main/java/cc/mrbird/febs/mall/dto/AdminRefundOrderDto.java
New file @@ -0,0 +1,12 @@ package cc.mrbird.febs.mall.dto; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "AdminRefundOrderDto", description = "参数接收类") public class AdminRefundOrderDto { private Long orderId; private Integer type; } src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
@@ -76,4 +76,6 @@ IPage<AdminGoodsStatisticsVo> goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request); FebsResponse deliverGoodsUpdate(DeliverGoodsDto deliverGoodsDto); FebsResponse confirmOrder(AdminRefundOrderDto dto); } src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -3,6 +3,9 @@ import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.common.enumerates.*; import cc.mrbird.febs.common.exception.FebsException; import cc.mrbird.febs.common.utils.AppContants; import cc.mrbird.febs.common.utils.LoginUserUtil; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.mapper.*; @@ -22,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Date; import java.util.List; @Slf4j @@ -505,6 +509,72 @@ } @Override public FebsResponse confirmOrder(AdminRefundOrderDto dto) { Integer type = dto.getType(); MallOrderInfo orderInfo = this.baseMapper.selectById(dto.getOrderId()); if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) { throw new FebsException("订单不存在"); } if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue()) { throw new FebsException("已提交退款, 请勿重复提交"); } if (orderInfo.getStatus() != OrderStatusEnum.WAIT_SHIPPING.getValue() && orderInfo.getStatus() != OrderStatusEnum.WAIT_FINISH.getValue()) { throw new FebsException("该订单不能退款"); } Integer beforeStatus = orderInfo.getStatus(); Long memberId = orderInfo.getMemberId(); orderInfo.setStatus(OrderStatusEnum.REFUNDING.getValue()); this.baseMapper.updateById(orderInfo); MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId()); if (orderRefund == null) { orderRefund = new MallOrderRefund(); orderRefund.setOrderId(orderInfo.getId()); orderRefund.setMemberId(memberId); orderRefund.setType(type); orderRefund.setRefundTime(new Date()); orderRefund.setBeforeStatus(beforeStatus); orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue()); // 未发货则退运费,发货了则不退 if (beforeStatus == 2) { orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage())); } else { orderRefund.setAmount(orderInfo.getAmount()); } orderRefund.setDesp(StrUtil.format("系统发起退款{}", orderRefund.getAmount())); orderRefund.setReason(StrUtil.format("系统发起退款{}", orderRefund.getAmount())); mallOrderRefundMapper.insert(orderRefund); } else { orderRefund.setType(type); orderRefund.setRefundTime(new Date()); orderRefund.setBeforeStatus(beforeStatus); orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue()); // 未发货则退运费,发货了则不退 if (beforeStatus == 2) { orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage())); } else { orderRefund.setAmount(orderInfo.getAmount()); } orderRefund.setDesp(StrUtil.format("系统发起退款{}", orderRefund.getAmount())); orderRefund.setReason(StrUtil.format("系统发起退款{}", orderRefund.getAmount())); mallOrderRefundMapper.updateById(orderRefund); } MallOrderRefundOperation operation = new MallOrderRefundOperation(); operation.setOrderId(orderInfo.getId()); operation.setRefundId(orderRefund.getId()); operation.setContent(StrUtil.format("系统发起退款{}", orderRefund.getAmount())); mallOrderRefundOperationMapper.insert(operation); return new FebsResponse().success().message("操作成功"); } @Override public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) { MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo()); if (mallOrderInfo == null) { src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -109,7 +109,7 @@ throw new FebsException("请重新选择收货地址信息"); } String orderNo = MallUtils.getOrderNum("order"); String orderNo = MallUtils.getOrderNum("O"); MallOrderInfo orderInfo = new MallOrderInfo(); orderInfo.setOrderNo(orderNo); orderInfo.setOrderTime(new Date()); src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -296,7 +296,7 @@ member.getId(), amount, ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(), MallUtils.getOrderNum("sign"), MallUtils.getOrderNum("s"), FlowTypeEnum.SCORE.getValue(), StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount), 2); @@ -307,7 +307,7 @@ member.getId(), amount, ScoreFlowTypeEnum.SIGN_SCORE.getValue(), MallUtils.getOrderNum("sign"), MallUtils.getOrderNum("s"), FlowTypeEnum.PRIZE_SCORE.getValue(), StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount), 2); src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -122,6 +122,8 @@ <div class="layui-btn-container"> <!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>--> <!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>--> <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="refundOrder">仅退款</button> <!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="refundOrderAndAmount">退款退货</button>--> <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button> <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</button> <!-- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>--> @@ -250,6 +252,54 @@ }); // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids; } if(event === 'refundOrder'){ let data = checkStatus.data; if (data.length > 1) { febs.alert.warn('每次只能操作一个订单'); return; } let ids = ""; for(let i = 0;i < data.length;i++){ if(data[i].status != 3){ febs.alert.warn('请选择待收货的订单'); return; }else{ ids = data[i].id; } } if(ids == null || ids == ""){ febs.alert.warn('请选择订单'); return; } febs.get(ctx + 'admin/order/refundOrder?orderId='+ids+'&type=1', null, function () { febs.alert.success('操作成功'); $query.click(); }); } if(event === 'refundOrderAndAmount'){ let data = checkStatus.data; if (data.length > 1) { febs.alert.warn('每次只能操作一个订单'); return; } let ids = ""; for(let i = 0;i < data.length;i++){ if(data[i].status != 3){ febs.alert.warn('请选择待收货的订单'); return; }else{ ids = data[i].id; } } if(ids == null || ids == ""){ febs.alert.warn('请选择订单'); return; } febs.get(ctx + 'admin/order/refundOrder?orderId='+ids+'&type=2', null, function () { febs.alert.success('操作成功'); $query.click(); }); } if (event == 'exportDeliverOne') { // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val(); // if(uniqueCodeValue == '' || uniqueCodeValue == null){ src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -171,7 +171,6 @@ {field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'}, {field: 'buyName', title: '用户名', minWidth: 150,align:'left'}, {field: 'buyPhone', title: '账号', minWidth: 150,align:'left'}, {field: 'buyBindPhone', title: '手机号', minWidth: 150,align:'left'}, {field: 'beforeStatus', title: '发货状态', templet: function (d) { if (d.beforeStatus === 1) { @@ -230,32 +229,32 @@ +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' }else if(d.type === 2){ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agreeWithAddress" shiro:hasPermission="user:update">同意</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' }else{ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agree" shiro:hasPermission="user:update">同意</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="disagree" shiro:hasPermission="user:update">拒绝</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' } }else if(d.status === 4){ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundConfirm" shiro:hasPermission="user:update">退款确认</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' }else{ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refunding" shiro:hasPermission="user:update">退款进度</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="refundOrderDetail" shiro:hasPermission="user:update">订单详情</button>' +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="paymentInfo" shiro:hasPermission="user:update">收款方式</button>' } },minWidth: 300,align:'center'} },minWidth: 400,align:'center'} ]] }); } src/main/resources/templates/febs/views/modules/order/refundOrderDetail.html
@@ -53,12 +53,12 @@ autocomplete="off" class="layui-input" readonly> </div> </div> <div class="layui-form-item"> <label class="layui-form-label">支付凭证:</label> <div class="layui-input-block"> <img alt="支付凭证" data-th-src="${refundOrderDetail.payImage}" style="width: 200px"> </div> </div> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label">支付凭证:</label>--> <!-- <div class="layui-input-block">--> <!-- <img alt="支付凭证" data-th-src="${refundOrderDetail.payImage}" style="width: 200px">--> <!-- </div>--> <!-- </div>--> <div class="layui-row layui-col-space10 layui-form-item"> <div class="layui-col-lg6">