From a1a51a92fd386ff07a7f05e40076508430a3c026 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 15 十一月 2022 14:30:33 +0800
Subject: [PATCH] #feat 订单、商品、用户地址、评价 接口新增
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 129 +++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 48 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 fd57fed..bac7901 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
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.DateUtils;
@@ -16,7 +17,6 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComShopFlowerOrderService;
-import com.panzhihua.service_community.service.ComShopOrderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +31,8 @@
import java.util.Date;
import java.util.List;
+import static java.util.Objects.nonNull;
+
/**
* @auther lyq
* @create 2021-04-14 15:03:01
@@ -42,25 +44,29 @@
implements ComShopFlowerOrderService {
@Resource
- private ComShopFlowerGoodsDAO comShopGoodsDAO;
+ private ComShopFlowerGoodsDAO comShopFlowerGoodsDAO;
@Resource
- private ComShopFlowerGoodsAttrDAO comShopGoodsAttrDAO;
+ private ComShopFlowerGoodsAttrDAO comShopFlowerGoodsAttrDAO;
@Resource
private ComShopCartDAO comShopCartDAO;
@Resource
- private ComShopStoreDAO comShopStoreDAO;
- @Resource
private ConvenientMerchantDAO convenientMerchantDAO;
@Resource
- private ComShopFlowerUserAddressDAO comShopUserAddressDAO;
+ private ComShopFlowerUserAddressDAO comShopFlowerUserAddressDAO;
@Resource
- private ComShopFlowerOrderOperateDAO comShopOrderOperateDAO;
+ private ComShopFlowerOrderOperateDAO comShopFlowerOrderOperateDAO;
@Resource
- private ComShopFlowerOrderGoodsDAO comShopOrderGoodsDAO;
+ private ComShopFlowerOrderGoodsDAO comShopFlowerOrderGoodsDAO;
@Resource
- private ComShopFlowerOrderDAO comShopOrderDAO;
+ private ComShopFlowerOrderDAO comShopFlowerOrderDAO;
@Resource
- private ComShopFlowerOrderPayDAO comShopOrderPayDAO;
+ private ComShopFlowerOrderPayDAO comShopFlowerOrderPayDAO;
+ @Resource
+ private ConvenientElevatingPointDAO convenientElevatingPointDAO;
+ @Resource
+ private ComShopFlowerEvaluateDAO comShopFlowerEvaluateDAO;
+
+
@Value("${min.app.isTest}")
private Boolean isTest;
@Value("${min.app.appid}")
@@ -98,7 +104,7 @@
if (orderPreviewDTO.getSubmitType().equals(ComShopOrderPreviewDTO.submitType.details)) {// 详情页提交
// 查询商品信息
ComShopFlowerGoodsDO goodsDO =
- comShopGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", orderPreviewDTO.getGoodsId())
+ comShopFlowerGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", orderPreviewDTO.getGoodsId())
.eq("status", ComShopGoodsDO.status.sell).eq("delete_status", ComShopGoodsDO.deleteStatus.no));
if (goodsDO == null) {
return R.fail("商品已下架或已删除");
@@ -107,9 +113,12 @@
storeId = goodsDO.getStoreId();
// 查询商品规格信息
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderPreviewDTO.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderPreviewDTO.getGoodsAttrId());
if (goodsAttrDO == null) {
return R.fail("商品规格不存在");
+ }
+ if (goodsAttrDO.getSale() < orderPreviewDTO.getBuyNum()){
+ return R.fail("该规格库存不足，无法下单");
}
orderTotal = goodsAttrDO.getPrice().multiply(BigDecimal.valueOf(orderPreviewDTO.getBuyNum()));
@@ -140,7 +149,7 @@
orderGoodsVO.setNum(cartDO.getAmount());
orderGoodsVO.setGoodsName(cartDO.getGoodsName());
// 查询商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(cartDO.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(cartDO.getGoodsAttrId());
if (goodsAttrDO != null) {
orderGoodsVO.setPrice(goodsAttrDO.getPrice());
} else {
@@ -164,7 +173,7 @@
// 查询默认收货地址
ComShopFlowerUserAddressDO userDefaultAddressDO =
- comShopUserAddressDAO.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>().eq("delete_status", 2)
+ comShopFlowerUserAddressDAO.selectOne(new QueryWrapper<ComShopFlowerUserAddressDO>().eq("delete_status", 2)
.eq("user_id", orderPreviewDTO.getUserId()).eq("is_default", ComShopUserAddressDO.isDefault.yes));
// 查询用户收货地址中的默认地址
@@ -179,7 +188,7 @@
.eq("delete_status", 2).eq("user_id", orderPreviewDTO.getUserId()).orderByDesc("create_at"));
if (shopOrders != null && shopOrders.size() > 0) {
ComShopFlowerUserAddressDO userAddressDO =
- comShopUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
+ comShopFlowerUserAddressDAO.selectById(shopOrders.get(0).getReceiverId());
if (userAddressDO != null) {
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
BeanUtils.copyProperties(userAddressDO, userAddressVO);
@@ -204,7 +213,7 @@
// 创建返回参数
ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
// 查询用户收货地址
- ComShopFlowerUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
+ ComShopFlowerUserAddressDO userAddressDO = comShopFlowerUserAddressDAO.selectById(orderCreateDTO.getReceiverId());
if (userAddressDO == null || userAddressDO.getDeleteStatus() != 2) {
return R.fail("收货地址不存在");
}
@@ -224,7 +233,7 @@
for (ComShopOrderCreateGoodsDTO createGoodsDTO : orderCreateDTO.getOrderGoodsList()) {
// 查询当前商品信息
ComShopFlowerGoodsDO goodsDO =
- comShopGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", createGoodsDTO.getGoodsId())
+ comShopFlowerGoodsDAO.selectOne(new QueryWrapper<ComShopFlowerGoodsDO>().eq("id", createGoodsDTO.getGoodsId())
.eq("delete_status", ComShopGoodsDO.deleteStatus.no).eq("status", ComShopGoodsDO.status.sell));
if (goodsDO == null) {
log.error("未查询到商品信息,商品已下架活已删除,商品id" + createGoodsDTO.getGoodsId());
@@ -240,11 +249,15 @@
orderGoodsDO.setAmount(createGoodsDTO.getNum());
orderGoodsDO.setOrderNo(orderNo);
// 查询当前商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(createGoodsDTO.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(createGoodsDTO.getGoodsAttrId());
if (goodsAttrDO == null) {
log.error(
"未查询到商品规格信息,商品id" + createGoodsDTO.getGoodsId() + "商品规格id:" + createGoodsDTO.getGoodsAttrId());
continue;
+ }
+
+ if (goodsAttrDO.getSale() < createGoodsDTO.getNum()){
+ return R.fail("该规格库存不足，无法下单");
}
orderGoodsDO.setGoodsAttrId(goodsAttrDO.getId());
orderGoodsDO.setGoodsAttrPrice(goodsAttrDO.getPrice());
@@ -274,6 +287,7 @@
shopOrderDO.setTotalAmount(orderTotal);
shopOrderDO.setDiscountAmount(BigDecimal.ZERO);
shopOrderDO.setDeliveryType(deliveryType);
+ shopOrderDO.setPointId(orderCreateDTO.getPointId());
if (StringUtils.isNotEmpty(orderCreateDTO.getRemark())) {
shopOrderDO.setRemark(orderCreateDTO.getRemark());
}
@@ -281,7 +295,7 @@
if (!orderGoodsDOList.isEmpty()) {
orderGoodsDOList.forEach(orderGoods -> {
orderGoods.setOrderId(shopOrderDO.getId());
- comShopOrderGoodsDAO.insert(orderGoods);
+ comShopFlowerOrderGoodsDAO.insert(orderGoods);
});
}
// 创建订单操作记录
@@ -296,7 +310,7 @@
orderOperateDO.setOperationContent("用户下单");
orderOperateDO.setOperationBy("用户");
}
- comShopOrderOperateDAO.insert(orderOperateDO);
+ comShopFlowerOrderOperateDAO.insert(orderOperateDO);
shopOrderVO.setOrderNo(orderNo);
shopOrderVO.setOrderTotal(orderTotal);
shopOrderVO.setOrderId(shopOrderDO.getId());
@@ -332,14 +346,14 @@
orderPageVOIPage.getRecords().forEach(orderVo -> {
List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
// 查询订单下商品信息
- List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO
+ List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().eq("order_no", orderVo.getOrderNo()));
if (!orderGoodsDOList.isEmpty()) {
orderGoodsDOList.forEach(orderGoods -> {
ComShopFlowerOrderGoodsVO orderGoodsVO = new ComShopFlowerOrderGoodsVO();
BeanUtils.copyProperties(orderGoods, orderGoodsVO);
// 根据商品规格id查询商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
if (goodsAttrDO != null) {
orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
}
@@ -392,7 +406,7 @@
List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
// 查询订单下商品信息
- List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO
+ List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().eq("order_no", shopOrderDO.getOrderNo()));
StringBuilder sbr = new StringBuilder();
if (!orderGoodsDOList.isEmpty()) {
@@ -403,7 +417,7 @@
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
// 查询商品信息判断商品状态
- ComShopFlowerGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGoods.getGoodsId());
+ ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGoods.getGoodsId());
if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)
|| goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.status.recovery)) {
orderGoodsVO.setGoodsStatus(ComShopFlowerOrderGoodsVO.goodsStatus.ysc);
@@ -414,7 +428,7 @@
}
// 根据商品规格id查询商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
if (goodsAttrDO != null) {
orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
}
@@ -427,7 +441,7 @@
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
// 查询用户收货地址
- ComShopFlowerUserAddressDO userAddressDO = comShopUserAddressDAO.selectById(shopOrderDO.getReceiverId());
+ ComShopFlowerUserAddressDO userAddressDO = comShopFlowerUserAddressDAO.selectById(shopOrderDO.getReceiverId());
if (userAddressDO != null) {
BeanUtils.copyProperties(userAddressDO, userAddressVO);
orderVO.setUserAddressVO(userAddressVO);
@@ -435,7 +449,7 @@
// 操作日志
List<ComShopFlowerOrderOperateDO> listOperLog =
- comShopOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderOperateDO>()
+ comShopFlowerOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderOperateDO>()
.eq(ComShopFlowerOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
List<ComShopFlowerOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
listOperLog.forEach(logDO -> {
@@ -444,6 +458,23 @@
listOperLogVO.add(copyVO);
});
orderVO.setLogs(listOperLogVO);
+ Long pointId = shopOrderDO.getPointId();
+ if (null!= pointId){
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
+ ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
+ BeanUtils.copyProperties(convenientElevatingPointVO,convenientElevatingPointDO);
+ orderVO.setConvenientElevatingPointVO(convenientElevatingPointVO);
+ }
+ //已完成、已退款才有评论
+ if (ComShopFlowerOrderDO.status.ywc == shopOrderDO.getStatus() || ComShopFlowerOrderDO.status.ytk == shopOrderDO.getStatus()){
+ ComShopFlowerEvaluateVO comShopFlowerEvaluateVO = comShopFlowerEvaluateDAO.selectByOrderNo(shopOrderDO.getOrderNo());
+ if (nonNull(comShopFlowerEvaluateVO)){
+ orderVO.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
+ }
+ }
+
+
+
return R.ok(orderVO);
}
@@ -480,7 +511,7 @@
orderOperateDO.setOperationContent("用户取消订单");
orderOperateDO.setOperationBy("用户");
}
- comShopOrderOperateDAO.insert(orderOperateDO);
+ comShopFlowerOrderOperateDAO.insert(orderOperateDO);
return R.ok();
} else {
return R.fail("取消订单失败");
@@ -551,7 +582,7 @@
orderOperateDO.setOperationContent("用户确认收货");
orderOperateDO.setOperationBy("用户");
}
- comShopOrderOperateDAO.insert(orderOperateDO);
+ comShopFlowerOrderOperateDAO.insert(orderOperateDO);
return R.ok();
} else {
return R.fail("确认收货失败");
@@ -603,7 +634,7 @@
*/
@Override
public R shipOrder(ComShopOrderShipDTO orderShipDTO) {
- ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderShipDTO.getOrderId());
+ ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderShipDTO.getOrderId());
if (comShopOrderDO == null) {
return R.fail("订单不存在");
}
@@ -621,7 +652,7 @@
comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
comShopOrderDO.setLogisticsCompany(orderShipDTO.getLogisticsCompany());
comShopOrderDO.setLogisticsNo(orderShipDTO.getLogisticsNo());
- int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
if (updated == 1) {
// 创建订单操作记录
ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
@@ -635,7 +666,7 @@
orderOperateDO.setOperationContent(orderShipDTO.getOperUserAccount() + "已发货");
orderOperateDO.setOperationBy(orderShipDTO.getOperUserAccount());
}
- int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
if (inserted != 1) {
log.error("订单发货日志保存错误");
}
@@ -646,7 +677,7 @@
@Override
public R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
- ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
+ ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderDeliverDTO.getOrderId());
if (comShopOrderDO == null) {
return R.fail("订单不存在");
}
@@ -661,7 +692,7 @@
comShopOrderDO.setDeliveryType(1);
comShopOrderDO.setStatus(3);
comShopOrderDO.setDeliveryTime(Calendar.getInstance().getTime());
- int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
if (updated == 1) {
// 创建订单操作记录
@@ -676,7 +707,7 @@
orderOperateDO.setOperationContent(orderDeliverDTO.getOperUserAccount() + "已发货");
orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}
- int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
if (inserted != 1) {
log.error("订单发货日志保存错误");
}
@@ -687,7 +718,7 @@
@Override
public R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO) {
- ComShopFlowerOrderDO comShopOrderDO = comShopOrderDAO.selectById(orderDeliverDTO.getOrderId());
+ ComShopFlowerOrderDO comShopOrderDO = comShopFlowerOrderDAO.selectById(orderDeliverDTO.getOrderId());
if (comShopOrderDO == null) {
return R.fail("订单不存在");
}
@@ -699,7 +730,7 @@
}
// comShopOrderDO.setStatus(4);
comShopOrderDO.setDeliveryStatus(5);
- int updated = comShopOrderDAO.updateById(comShopOrderDO);
+ int updated = comShopFlowerOrderDAO.updateById(comShopOrderDO);
if (updated == 1) {
// 创建订单操作记录
ComShopFlowerOrderOperateDO orderOperateDO = new ComShopFlowerOrderOperateDO();
@@ -713,7 +744,7 @@
orderOperateDO.setOperationContent("订单已完成");
orderOperateDO.setOperationBy(orderDeliverDTO.getOperUserAccount());
}
- int inserted = comShopOrderOperateDAO.insert(orderOperateDO);
+ int inserted = comShopFlowerOrderOperateDAO.insert(orderOperateDO);
if (inserted != 1) {
log.error("订单发货日志保存错误");
}
@@ -832,33 +863,35 @@
// 查询订单商品
List<ComShopFlowerOrderGoodsDO> orderGoodsList =
- comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().lambda()
+ comShopFlowerOrderGoodsDAO.selectList(new QueryWrapper<ComShopFlowerOrderGoodsDO>().lambda()
.eq(ComShopFlowerOrderGoodsDO::getOrderNo, shopOrderDO.getOrderNo()));
if (!orderGoodsList.isEmpty()) {
int goodsNub = 0;
for (ComShopFlowerOrderGoodsDO orderGood : orderGoodsList) {
goodsNub += orderGood.getAmount();
// 更新商品信息
- ComShopFlowerGoodsDO goodsDO = comShopGoodsDAO.selectById(orderGood.getGoodsId());
+ ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGood.getGoodsId());
if (goodsDO != null) {
goodsDO.setSale(goodsDO.getSale() + orderGood.getAmount());
- comShopGoodsDAO.updateById(goodsDO);
+ comShopFlowerGoodsDAO.updateById(goodsDO);
}
// 更新商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopGoodsAttrDAO.selectById(orderGood.getGoodsAttrId());
+ ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGood.getGoodsAttrId());
if (goodsAttrDO != null) {
goodsAttrDO.setSale(goodsAttrDO.getSale() + orderGood.getAmount());
- comShopGoodsAttrDAO.updateById(goodsAttrDO);
+ //减库存
+ goodsAttrDO.setStock(goodsAttrDO.getStock() - orderGood.getAmount());
+ comShopFlowerGoodsAttrDAO.updateById(goodsAttrDO);
}
}
// 更新店铺销量以及销售额
- ComShopStoreDO storeDO = comShopStoreDAO.selectById(shopOrderDO.getStoreId());
+ ConvenientMerchantDO storeDO = convenientMerchantDAO.selectById(shopOrderDO.getStoreId());
if (storeDO != null) {
storeDO.setSale(storeDO.getSale() + goodsNub);
storeDO.setSaleVolume(storeDO.getSaleVolume().add(shopOrderDO.getTotalAmount()));
- comShopStoreDAO.updateById(storeDO);
+ convenientMerchantDAO.updateById(storeDO);
}
}
@@ -869,7 +902,7 @@
orderOperateDO.setOperationTime(new Date());
orderOperateDO.setOperationContent("用户支付订单");
orderOperateDO.setOperationBy("用户");
- comShopOrderOperateDAO.insert(orderOperateDO);
+ comShopFlowerOrderOperateDAO.insert(orderOperateDO);
// 添加订单支付记录表
ComShopFlowerOrderPayDO orderPayDO = new ComShopFlowerOrderPayDO();
@@ -879,7 +912,7 @@
orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.yes);
orderPayDO.setPayAmount(shopOrderDO.getPayAmount());
orderPayDO.setPayTime(shopOrderDO.getPayTime());
- comShopOrderPayDAO.insert(orderPayDO);
+ comShopFlowerOrderPayDAO.insert(orderPayDO);
}
/**
@@ -893,7 +926,7 @@
// 创建返回参数
ComShopFlowerOrderVO shopOrderVO = new ComShopFlowerOrderVO();
// 查询订单
- ComShopFlowerOrderDO orderDO = comShopOrderDAO.selectOne(
+ ComShopFlowerOrderDO orderDO = comShopFlowerOrderDAO.selectOne(
new QueryWrapper<ComShopFlowerOrderDO>().lambda().eq(ComShopFlowerOrderDO::getOrderNo, orderPayDTO.getOrderNo()));
if (orderDO == null) {
return R.fail("订单不存在");
--
Gitblit v1.7.1