From d4a3ade55b4c2b541987cc73b7afb0e52b9a7c01 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:27:45 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailVO.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailVO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailVO.java
index b196782..1a722b9 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/GoodsorderDetailVO.java
@@ -14,7 +14,7 @@
* @author T14
*/
@Data
-@ApiModel("璁㈠崟璇︽儏")
+@ApiModel("濂楅鍗¤鍗曡鎯�")
public class GoodsorderDetailVO {
@ApiModelProperty(value = "璁㈠崟淇℃伅")
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 c451301..2d6a780 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
@@ -73,8 +73,6 @@
@Slf4j
public class GoodsorderServiceImpl implements GoodsorderService {
-
-
@Autowired
private GoodsorderMapper goodsorderMapper;
@@ -259,7 +257,6 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
queryWrapper.orderByAsc(Goodsorder::getPayDate);
goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
-
}else{
MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
@@ -298,9 +295,8 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Goodsorder.class);
queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
- queryWrapper.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
- queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getId ,Goodsorder::getObjId);
+ queryWrapper.select("(select r.name from discount_member r where r.isdeleted=0 and r.goodsorder_id=t.id limit 1) as discountName");
queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_date");
queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_money");
//鏃堕棿娈电瓫閫�
@@ -352,7 +348,6 @@
}
return PageData.from(goodsorderIPage);
}
-
@Override
public long count(Goodsorder goodsorder) {
@@ -543,7 +538,9 @@
goodsorderDetailVO.setMember(member);
}
//鏌ヨ鍟嗗搧淇℃伅
- DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getIsdeleted,Constants.ZERO)
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()));
if(Objects.nonNull(discountMember)){
goodsorderDetailVO.setDiscountMember(discountMember);
}
--
Gitblit v1.9.3