From de8b3cf7a9b22be7abcb544a53dcea7f1b340760 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 20 Aug 2025 17:23:14 +0800
Subject: [PATCH] feat(ai): 新增开始答题V2 接口
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index e8c6729..6189f60 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -17,6 +17,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@@ -82,12 +83,12 @@
.append("-")
.append(mallOrderItem.getSkuName())
.append("*").append(mallOrderItem.getCnt()).append("；");
- if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
- MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
- if(ObjectUtil.isNotEmpty(mallMember)){
- adminMallOrderInfoVo.setRefererName(mallMember.getName());
- }
- }
+// if(ObjectUtil.isNotEmpty(mallOrderItem.getMemberInviteId())){
+// MallMember mallMember = mallMemberMapper.selectInfoByInviteId(mallOrderItem.getMemberInviteId());
+// if(ObjectUtil.isNotEmpty(mallMember)){
+// adminMallOrderInfoVo.setRefererName(mallMember.getName());
+// }
+// }
}
adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
}
@@ -125,6 +126,7 @@
}
MallExpressInfo mallExpressInfo = new MallExpressInfo();
mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
+ mallExpressInfo.setOrderNo(mallOrderInfo.getOrderNo());
mallExpressInfo.setOrderId(mallOrderInfo.getId());
mallExpressInfo.setExpressNo(expressNo);
mallExpressInfo.setExpressCom(expressCom);
@@ -140,8 +142,15 @@
@Override
public AdminOrderDetailVo getMallOrderDetailById(long id) {
AdminOrderDetailVo adminOrderDetailVo = mallOrderInfoMapper.getMallOrderDetailById(id);
- MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
- if(ObjectUtil.isNotEmpty(mallExpressInfo)){
+ MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectOne(
+ Wrappers.lambdaQuery(MallExpressInfo.class)
+ .eq(MallExpressInfo::getOrderId, id)
+ .eq(MallExpressInfo::getOrderNo, adminOrderDetailVo.getOrderNo())
+ .last("limit 1")
+ );
+
+// MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(id);
+ if(ObjectUtil.isNotNull(mallExpressInfo)){
adminOrderDetailVo.setExpressNo(mallExpressInfo.getExpressNo());
adminOrderDetailVo.setExpressCom(mallExpressInfo.getExpressCom());
}
@@ -496,9 +505,15 @@
if(StrUtil.isEmpty(expressCom)){
return new FebsResponse().fail().message("请输入物流公司");
}
- MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(mallOrderInfo.getId());
+ MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectOne(
+ Wrappers.lambdaQuery(MallExpressInfo.class)
+ .eq(MallExpressInfo::getOrderId, mallOrderInfo.getId())
+ .eq(MallExpressInfo::getOrderNo, mallOrderInfo.getOrderNo())
+ .last("limit 1")
+ );
+// MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectByOrderId(mallOrderInfo.getId());
- if(ObjectUtil.isEmpty(mallExpressInfo)){
+ if(ObjectUtil.isNull(mallExpressInfo)){
return new FebsResponse().fail().message("请先发货");
}
mallExpressInfo.setExpressNo(expressNo);
@@ -584,6 +599,7 @@
MallExpressInfo mallExpressInfo = new MallExpressInfo();
mallExpressInfo.setMemberId(mallOrderInfo.getMemberId());
mallExpressInfo.setOrderId(mallOrderInfo.getId());
+ mallExpressInfo.setOrderNo(deliverGoodsDto.getOrderNo());
mallExpressInfo.setExpressNo(deliverGoodsDto.getExpressNo());
mallExpressInfo.setExpressCom(deliverGoodsDto.getExpressCom());
mallExpressInfo.setExpressCode(deliverGoodsDto.getExpressCode());
--
Gitblit v1.9.1