From 2a212f983f35e1c569dfec3a172fb5f0c9f85fac Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 06 十二月 2022 13:43:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java
index 6b52f88..d0eb48d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerEvaluateServiceImpl.java
@@ -1,5 +1,7 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,13 +10,18 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ComShopFlowerEvaluateVO;
import com.panzhihua.service_community.dao.ComShopFlowerEvaluateDAO;
+import com.panzhihua.service_community.dao.ComShopFlowerOrderDAO;
import com.panzhihua.service_community.model.dos.ComShopFlowerEvaluateDO;
+import com.panzhihua.service_community.model.dos.ComShopFlowerOrderDO;
import com.panzhihua.service_community.service.ComShopFlowerEvaluateService;
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;
+import java.util.Objects;
/**
* @auther yh
@@ -26,13 +33,23 @@
public class ComShopFlowerEvaluateServiceImpl extends ServiceImpl<ComShopFlowerEvaluateDAO, ComShopFlowerEvaluateDO>
implements ComShopFlowerEvaluateService {
+ @Resource
+ private ComShopFlowerOrderDAO comShopFlowerOrderDAO;
+
@Override
+ @Transactional(rollbackFor = Exception.class)
public R saveEvaluate(ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
ComShopFlowerEvaluateDO comShopFlowerEvaluateDO = new ComShopFlowerEvaluateDO();
- BeanUtils.copyProperties(comShopFlowerEvaluateDO,comShopFlowerEvaluateDTO);
+ BeanUtils.copyProperties(comShopFlowerEvaluateDTO,comShopFlowerEvaluateDO);
//评价时间
comShopFlowerEvaluateDO.setEvaluateTime(new Date());
+ ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getOrderNo, comShopFlowerEvaluateDTO.getOrderNo()));
+ if (Objects.isNull(comShopFlowerOrderDO)){
+ R.fail("未找到该订单");
+ }
+ comShopFlowerOrderDO.setStatus(ComShopFlowerOrderDO.status.ywc);
+ comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);
this.baseMapper.insert(comShopFlowerEvaluateDO);
return R.ok();
}
@@ -50,6 +67,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R deleteEvaluate(Long id) {
return R.ok(this.baseMapper.deleteById(id));
}
--
Gitblit v1.7.1