xiaoyong931011
2023-02-13 a16d82a25c10fc67a98567cc90d5692cab931898
订单发货设置
2 files modified
13 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java 9 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/order/orderList.html 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -120,7 +120,7 @@
        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                OrderStatusEnum.WAIT_FINISH.getValue(),
                OrderDeliveryStateEnum.DELIVERY_ING.getValue());
                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
        return new FebsResponse().success();
    }
@@ -459,7 +459,10 @@
        mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
        mallExpressInfoMapper.insert(mallExpressInfo);
        mallOrderInfo.setStatus(3);
        mallOrderInfoMapper.updateById(mallOrderInfo);
        mallOrderInfoMapper.updateOrderStateAndDeliveryState(mallOrderInfo.getId(),
                OrderStatusEnum.WAIT_FINISH.getValue(),
                OrderDeliveryStateEnum.DELIVERY_FINISH.getValue());
//        mallOrderInfo.setStatus(3);
//        mallOrderInfoMapper.updateById(mallOrderInfo);
    }
}
src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -207,7 +207,7 @@
                // window.location.href = ctx + "admin/order/confirmOrder?takeUniqueCode="+uniqueCodeValue+"&orderIds="+ids;
            }
            if(event === 'confirmOrder'){
                let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // let uniqueCodeValue = $searchForm.find("select[name='uniqueCode']").val();
                // if(uniqueCodeValue == '' || uniqueCodeValue == null){
                //     febs.alert.warn('请选择团长');
                //     return;
@@ -231,7 +231,7 @@
                    febs.alert.warn('请选择确认到货的订单');
                    return;
                }
                febs.get(ctx + 'admin/order/confirmOrder?takeUniqueCode='+uniqueCodeValue+'&orderIds='+ids, null, function () {
                febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
                    febs.alert.success('操作成功');
                    $query.click();
                });