| | |
| | | @RequiresPermissions("deliverGoods:update") |
| | | public String deliverGoods(@PathVariable long id, Model model) { |
| | | AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id); |
| | | data.setExpressCom("中通快递"); |
| | | data.setExpressCom("极兔快递"); |
| | | MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id); |
| | | if(ObjectUtil.isNotEmpty(mallExpressInfo)){ |
| | | data.setExpressNo(mallExpressInfo.getExpressNo()); |
| | | data.setExpressCom(mallExpressInfo.getExpressCom()); |
| | | }else{ |
| | | data.setExpressCom("中通快递"); |
| | | data.setExpressCom("极兔快递"); |
| | | data.setExpressNo("JT"); |
| | | } |
| | | model.addAttribute("deliverInfo", data); |
| | | return FebsUtil.view("modules/order/deliverGoods"); |
| | |
| | | return FebsUtil.view("modules/order/goodsStatistics"); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 发票列表 |
| | | * @return |
| | | */ |
| | | @GetMapping("invoiceList") |
| | | @RequiresPermissions("invoiceList:view") |
| | | public String invoiceList() { |
| | | return FebsUtil.view("modules/order/invoiceList"); |
| | | } |
| | | |
| | | } |