From 5c64643fb7ef2650d67bd7bef4e7965ef8f49800 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 22 四月 2021 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 5bfbc88..b4bc57b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -612,6 +612,10 @@
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){
@@ -623,7 +627,7 @@
@Override
public R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO) {
Page page = new Page();
- page.setSize(1000);
+ page.setSize(10000);
page.setCurrent(1);
IPage<ExcelShopOrderDTO> excelShopOrderDTO = comShopOrderDAO.selectOrderExport(page, comShopOrderExportDTO);
return R.ok(excelShopOrderDTO.getRecords());
@@ -632,7 +636,7 @@
@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());
--
Gitblit v1.7.1