| | |
| | | if(!(comShopOrderDO.getDeliveryStatus() == 4)){ |
| | | return R.fail("订单还未开始配送"); |
| | | } |
| | | if(!(comShopOrderDO.getStatus() == 3)){ |
| | | return R.fail("订单还未发货"); |
| | | } |
| | | comShopOrderDO.setStatus(4); |
| | | comShopOrderDO.setDeliveryStatus(5); |
| | | int updated = comShopOrderDAO.updateById(comShopOrderDO); |
| | | if(updated==1){ |
| | |
| | | @Override |
| | | public R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO) { |
| | | Page page = new Page(); |
| | | page.setSize(1000); |
| | | page.setSize(10000); |
| | | page.setCurrent(1); |
| | | IPage<ExcelShopFundsDTO> excelShopFundsDTO = comShopOrderDAO.selectFundsExport(page, comShopFundsExportDTO); |
| | | return R.ok(excelShopFundsDTO.getRecords()); |