From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 4611954..a8a17a7 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -194,7 +194,7 @@
goodsorderMapper.updateById(goodsorder);
}
- @Override
+ /*@Override
public IPage<Shop> getShopPage(PageWrap<Shop> pageWrap) {
IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
Shop model = pageWrap.getModel();
@@ -213,7 +213,7 @@
.like(StringUtils.isNotBlank(model.getName()),Shop::getName,model.getName())
.orderByAsc(" distance ")
);
- }
+ }*/
/**
@@ -770,6 +770,7 @@
goodsorder.setDistributionShopId(shop.getId());
if(Objects.isNull(member.getBindShopId())){
member.setBindShopId(shop.getId());
+ member.setBindShopDate(new Date());
}
}
@@ -1056,6 +1057,14 @@
if(Constants.equalsInteger(memberOrderResponse.getReceiveType(),Constants.ONE)){
memberOrderResponse.setShopInfo(shopMapper.selectById(memberOrderResponse.getShopId()));
}
+ Member member = memberMapper.selectById(memberOrderResponse.getMemberId());
+ if(Objects.nonNull(member)){
+ String memberfullUrl = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode();
+ member.setImgFullUrl(memberfullUrl + member.getImgurl());
+ memberOrderResponse.setMember(member);
+ }
+
return memberOrderResponse;
}
@@ -1786,10 +1795,12 @@
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.GOODSORDER_KEY,0);
//鍔犲叆redis缂撳瓨锛屽埛鏂颁粖澶╁敭鍚庣紪鍙�0寮�濮�
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.AFTERSALE_KEY,0);
+ //鍔犲叆redis缂撳瓨锛屽埛鏂颁粖澶╁敭鍚庣紪鍙�0寮�濮�
+ RedisUtil.addObject(redisTemplate,Constants.RedisKeys.WITHDRAW_KEY,0);
}
@Override
public void refreshOrderCodes(){
- long countOrder = 0,countSign=0,countSale=0;
+ long countOrder = 0,countSign=0,countSale=0,countWithdraw=0;
QueryWrapper<Goodsorder> order = new QueryWrapper<>();
order.apply(true, "TO_DAYS(NOW())=TO_DAYS(create_date)");
@@ -1818,6 +1829,22 @@
}
//鍔犲叆redis缂撳瓨锛屽埛鏂颁粖澶╁敭鍚庣紪鍙�0寮�濮�
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.AFTERSALE_KEY,countSale);
+
+
+
+ QueryWrapper<WithdrawRecord> withdraw = new QueryWrapper<>();
+ withdraw.apply(true, "TO_DAYS(NOW())=TO_DAYS(create_date)");
+ withdraw.orderByDesc(" CODE ");
+ withdraw.last(" limit 1 ");
+ Aftersale maxWithdrawOrder = aftersaleMapper.selectOne(sale);
+ if(!Objects.isNull(maxWithdrawOrder)){
+ countWithdraw = Integer.valueOf(maxOrder.getCode().toString().substring(8,12));
+ }
+ //鍔犲叆redis缂撳瓨锛屽埛鏂颁粖澶╁敭鍚庣紪鍙�0寮�濮�
+ RedisUtil.addObject(redisTemplate,Constants.RedisKeys.WITHDRAW_KEY,countWithdraw);
+
+
+
}
@@ -1899,11 +1926,13 @@
.eq(Goodsorder::getMemberId,member.getId())
.eq(Goodsorder::getStatus,Constants.OrderStatus.WAIT_RECEIVE.getKey()))
);
+
homeInfoResponse.setWaitPayNum(
goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda().eq(Goodsorder::getIsdeleted,Constants.ZERO)
.eq(Goodsorder::getMemberId,member.getId())
.eq(Goodsorder::getStatus,Constants.OrderStatus.WAIT_PAY.getKey()))
);
+
homeInfoResponse.setCartTypeNum(
shopcartMapper.selectCount(new QueryWrapper<Shopcart>().lambda()
.eq(Shopcart::getIsdeleted,Constants.ZERO)
@@ -1925,11 +1954,44 @@
);
return homeInfoResponse;
-
-
}
+ @Override
+ public PageData<Goodsorder> shopOrderPage(PageWrap<ShopOrderRequest> pageWrap) {
+ Integer shopId = null;
+ Integer status = null;
+ IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ ShopOrderRequest model = pageWrap.getModel();
+ queryWrapper.selectAll(Goodsorder.class);
+// queryWrapper.selectAs(Member::getNickname,Goodsorder::getNickName);
+// queryWrapper.selectAs(Member::getPhone,Goodsorder::getPhone);
+// queryWrapper.selectAs(Member::getImgurl,Goodsorder::getImgurl);
+ queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Objects.nonNull(model.getStatus()),Goodsorder::getStatus,model.getStatus());
+ queryWrapper.eq(Objects.nonNull(model.getShopId()),Goodsorder::getDistributionShopId,model.getShopId());
+ queryWrapper.orderByDesc(Goodsorder::getCreateDate);
+
+ IPage<Goodsorder> result = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
+
+ String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_FILE).getCode();
+
+ for(Goodsorder goodsorder:result.getRecords()){
+
+ List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailJoinMapper.selectList(new QueryWrapper<GoodsorderDetail>().lambda()
+ .eq(GoodsorderDetail::getOrderId,goodsorder.getId()));
+ goodsorderDetailList.stream().forEach(s ->{
+ if(StringUtils.isBlank(s.getImgurl())){
+ s.setImgurl(path + s.getGoodsImgurl());
+ }
+ });
+ goodsorder.setGoodsorderDetailList(goodsorderDetailList);
+ }
+ return PageData.from(result);
+ }
--
Gitblit v1.9.3