From 15ec9481bb9768378a512530a8facb4dccdd62f6 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 18 二月 2025 14:51:07 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 43b7c48..bc917a3 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -34,6 +34,7 @@
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
@@ -200,13 +201,6 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
-
-// queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
-// queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
-// queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
-// queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
-// queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
-// queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
queryWrapper.orderByAsc(Goodsorder::getPayDate);
@@ -328,6 +322,7 @@
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Goodsorder::getType,pageWrap.getModel().getType());
queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
"(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
+ queryWrapper.select("( select s.realname from refund r left join system_user s on r.creator = s.id where r.obj_id = t.id order by r.id desc limit 1 ) ",Goodsorder::getRefundUserName);
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
@@ -446,7 +441,6 @@
@Override
public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {
-
List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
Goodsorder goodsorder = goodsorderMapper.selectById(id);
if(goodsorder == null){
@@ -495,6 +489,45 @@
goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄
return goodsorderDetailDTO;
}
+
+
+
+ @Override
+ public GoodsorderDetailVO getGoodsorderDetailForDisCount(String id){
+ GoodsorderDetailVO goodsorderDetailVO = new GoodsorderDetailVO();
+ Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ if(goodsorder == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ goodsorderDetailVO.setGoodsOrder(goodsorder);
+ Member member = memberMapper.selectById(goodsorder.getMemberId());
+ if(Objects.nonNull(member)){
+ goodsorderDetailVO.setMember(member);
+ }
+ //鏌ヨ鍟嗗搧淇℃伅
+ DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ if(Objects.nonNull(discountMember)){
+ goodsorderDetailVO.setDiscountMember(discountMember);
+ }
+ //鏌ヨ鎵�鏈夋湁閫�娆捐褰�
+ List<Refund> refunds = refundJoinMapper.selectJoinList(Refund.class,
+ new MPJLambdaWrapper<Refund>()
+ .selectAll(Refund.class)
+ .selectAs(SystemUser::getRealname,Refund::getCreatorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Refund::getCreator)
+ .eq(Refund::getObjId,goodsorder.getId())
+ .orderByDesc(Refund::getId)
+ );
+ goodsorderDetailVO.setRefundList(refunds);
+
+ return goodsorderDetailVO;
+ }
+
+
+
@Override
public void forceCloseGoodsorder(String orderId) {
//鏌ヨ璁㈠崟 淇℃伅
--
Gitblit v1.9.3