From 4f4538356403d620b9bd510fd45729a251291942 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 03 七月 2026 18:27:36 +0800
Subject: [PATCH] 功能开发
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 07b08e1..5e5c170 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
@@ -391,6 +391,7 @@
homeResponse.setTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_NOTICE).getCode());
homeResponse.setLeaseVideoUrl(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_TIPS_VIDEO).getCode());
homeResponse.setStopServeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
+ homeResponse.setDouyinExchangeTips(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.DOUYIN_EXCHANGE_TIPS).getCode());
homeResponse.setIsStopServe(this.checkTemporaryStop()?1:0);
homeResponse.setIsBusiness(this.checkBusiness()?0:1);
homeResponse.setUnBusinessTips("钀ヤ笟鏃堕棿涓�"+ systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_STARTTIME).getCode() +" ~ "+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.BUSINESS_ENDTIME).getCode()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
@@ -481,6 +482,13 @@
}
}
}
+ // 褰撳墠浼氬憳鏈夋晥濂楅(status=0 姝ｅ父 + isdeleted=0),鎸夎幏寰楁椂闂�(createDate)鍊掑簭,鏈�澶�10鏉�
+ homeResponse.setValidDiscountList(discountMemberMapper.selectList(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getMemberId, memberId)
+ .eq(DiscountMember::getStatus, Constants.ZERO)
+ .eq(DiscountMember::getIsdeleted, Constants.ZERO)
+ .orderByDesc(DiscountMember::getCreateDate)
+ .last(" limit 10 ")));
return homeResponse;
}
@@ -976,7 +984,16 @@
@Override
public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO) {
+ // platform 绔�:鐧诲綍浜轰粠 Shiro 涓婁笅鏂囧彇,濮旀墭缁欏甫 creator 鐨勯噸杞芥柟娉�
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if (Objects.isNull(principal) || StringUtils.isBlank(principal.getId())) {
+ throw new BusinessException(ResponseStatus.BE_OVERDUE);
+ }
+ backGoodsorder(goodsorderBackDTO, principal.getId());
+ }
+
+ @Override
+ public void backGoodsorder(GoodsorderBackDTO goodsorderBackDTO, String creator) {
if(Objects.isNull(goodsorderBackDTO)
|| StringUtils.isBlank(goodsorderBackDTO.getOrderId())
|| Objects.isNull(goodsorderBackDTO.getBackType())
@@ -1012,7 +1029,7 @@
refundDTO.setRefundAmount(goodsorderBackDTO.getMoney().multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
- refundDTO.setCreator(principal.getId());
+ refundDTO.setCreator(creator);
refundDTO.setReason(goodsorderBackDTO.getReason());
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
//閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
@@ -1032,7 +1049,7 @@
//鎿嶄綔鏃ュ織
DiscountLog discountLog = new DiscountLog();
discountLog.setIsdeleted(Constants.ZERO);
- discountLog.setCreator(principal.getId());
+ discountLog.setCreator(creator);
discountLog.setCreateDate(new Date());
discountLog.setDiscountMemberId(discountMember.getId());
discountLog.setType(Constants.ONE);
--
Gitblit v1.9.3