From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index 5440123..71c53c8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -40,7 +40,6 @@
*/
@Slf4j
@Service
-@Transactional(rollbackFor = Exception.class)
public class ComShopFlowerOrderServiceImpl extends ServiceImpl<ComShopFlowerOrderDAO, ComShopFlowerOrderDO>
implements ComShopFlowerOrderService {
@@ -68,6 +67,8 @@
private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
@Resource
private ComShopFlowerRefundOrderDAO comShopFlowerRefundOrderDAO;
+ @Resource
+ private ComShopFlowerOrderDeliveryDAO comShopFlowerOrderDeliveryDAO;
@Value("${hcMin.app.isTest}")
@@ -565,6 +566,7 @@
* @return 删除结果
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R orderDelete(Long orderId) {
// 查询订单
ComShopFlowerOrderDO shopOrderDO = this.baseMapper.selectById(orderId);
@@ -870,6 +872,8 @@
* @param orderPayDTO 请求参数
* @return 支付对象
*/
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public R wxPay(OrderPayDTO orderPayDTO) {
// 创建返回参数
ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
@@ -900,11 +904,8 @@
@Override
public R pageOrderByStoreId(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
-
Page page = new Page(pageComFlowerOrderListDTO.getPageNum(), pageComFlowerOrderListDTO.getPageSize());
-
IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByStoreId(page, pageComFlowerOrderListDTO);
-
if (!orderPageVOIPage.getRecords().isEmpty()) {
orderPageVOIPage.getRecords().forEach(orderVo -> {
if (null!=orderVo.getPointId()){
@@ -1043,4 +1044,23 @@
}
return R.ok(retMap);
}
+
+ @Override
+ public R pageOrderByDeliveryNo(PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ Page page = new Page(pageComFlowerOrderListDTO.getPageNum(), pageComFlowerOrderListDTO.getPageSize());
+ IPage<ComShopFlowerOrderStoreListVO> orderPageVOIPage = this.baseMapper.pageOrderByDeliveryNo(page, pageComFlowerOrderListDTO);
+ ComShopFlowerOrderDeliveryNoListVO comShopFlowerOrderDeliveryNoListVO = new ComShopFlowerOrderDeliveryNoListVO();
+ ComShopFlowerOrderDeliveryDO comShopFlowerOrderDeliveryDO = comShopFlowerOrderDeliveryDAO.selectById(pageComFlowerOrderListDTO.getDeliveryId());
+ ComShopFlowerOrderDeliveryVO comShopFlowerOrderDeliveryVO = new ComShopFlowerOrderDeliveryVO();
+ BeanUtils.copyProperties(comShopFlowerOrderDeliveryDO,comShopFlowerOrderDeliveryVO);
+
+ Long pointId = comShopFlowerOrderDeliveryDO.getPointId();
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(convenientElevatingPointDO,convenientElevatingPointVO);
+ comShopFlowerOrderDeliveryVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
+ comShopFlowerOrderDeliveryNoListVO.setComShopFlowerOrderDeliveryVO(comShopFlowerOrderDeliveryVO);
+ comShopFlowerOrderDeliveryNoListVO.setPage(orderPageVOIPage);
+ return R.ok(comShopFlowerOrderDeliveryNoListVO);
+ }
}
--
Gitblit v1.7.1