From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 74ead5c..68a49e9 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;
}
@@ -811,7 +819,8 @@
if(type == 0|| type ==1 || type==2){
//濡傛灉鏄樁娈甸��娆�
Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
- closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),null);
+ List<MemberRides> memberRides = getMemberRidesForClose(goodsorder.getId());//鎵撹溅楠戣璁板綍
+ closeGoodsorderDoneNoRefund(goodsorder,type,refund.getMoney(),refund.getId(),memberRides);
}
}
@@ -975,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())
@@ -1011,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());
//閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
@@ -1031,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);
@@ -1359,7 +1377,7 @@
request.setOutTradeNo(goodsorder.getId());
request.setNotifyUrl(WxMiniConfig.wxProperties.getNotifyUrl());//杩欎釜鍥炶皟url蹇呴』鏄痟ttps寮�澶寸殑
Amount amount = new Amount();
- amount.setTotal(goodsorder.getMoney().intValue());
+ amount.setTotal(1);//goodsorder.getMoney().intValue());
request.setAmount(amount);
// PrepayResponse res = WxMiniConfig.wxPayService.prepay(request);
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
--
Gitblit v1.9.3