From 6c6c0825e59377261b9972af95e1e4dafb43fcfd Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 25 十一月 2022 17:44:04 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
index 88ae0b7..6580e80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderDeliveryServiceImpl.java
@@ -9,6 +9,7 @@
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderDeliveryDTO;
import com.panzhihua.common.model.dtos.shop.PageComFlowerOrderListDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointOrderVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderDeliveryVO;
import com.panzhihua.common.model.vos.shop.ComShopFlowerOrderPageVO;
@@ -23,6 +24,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
@@ -48,6 +50,7 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public R saveDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = new ComShopFlowerOrderDeliveryDO();
BeanUtils.copyProperties(comShopFlowerOrderDeliveryDTO,comShopFlowerOrderDeliveryDO);
@@ -69,6 +72,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R updateDelivery(ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
Long id = comShopFlowerOrderDeliveryDTO.getId();
if (null == id){
@@ -79,7 +83,7 @@
return R.fail("不存在该配送单");
}
comShopFlowerOrderDeliveryDO.setServiceTime(new Date());
- comShopFlowerOrderDeliveryDO.setDeleteStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
+ comShopFlowerOrderDeliveryDO.setDeliveryStatus(ComShopFlowerOrderDeliveryDO.deliveryStatus.ysd);
int update = this.baseMapper.updateById(comShopFlowerOrderDeliveryDO);
if (update > 0){
comShopFlowerOrderDAO.updateOrderStatus(comShopFlowerOrderDeliveryDO.getId(),comShopFlowerOrderDeliveryDO.getServiceTime(),ComShopFlowerOrderDO.status.dsh);
@@ -113,7 +117,11 @@
public R pageNoDeliveryOrderList(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
Page page = new Page<>(pageComFlowerOrderListDTO.getPageNum(),pageComFlowerOrderListDTO.getPageSize());
IPage<ComShopFlowerOrderPageVO> iPage = comShopFlowerOrderDAO.pageOrderListNoDelivery(page, pageComFlowerOrderListDTO);
- return R.ok(iPage);
+ ConvenientElevatingPointVO convenientElevatingPointVO = convenientElevatingPointDAO.selectOrderNum(pageComFlowerOrderListDTO);
+ ConvenientElevatingPointOrderVO convenientElevatingPointOrderVO = new ConvenientElevatingPointOrderVO();
+ convenientElevatingPointOrderVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
+ convenientElevatingPointOrderVO.setIPage(iPage);
+ return R.ok(convenientElevatingPointOrderVO);
}
--
Gitblit v1.7.1