From 83c22c357528a7d265952248e084d975d37de55e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 17:07:00 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 53 ++++++++++++++++++++++++-----------------------------
1 files changed, 24 insertions(+), 29 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 28599f9..e2c3aaf 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
@@ -52,6 +52,7 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.sql.Ref;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -237,16 +238,6 @@
.eq("status",Constants.ZERO)
.orderByDesc("create_date")
));
- if(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.IS_STOP_SERVE).getCode().equals(Constants.ONE)){
- String stopServeStartTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_STARTTIME).getCode();
- String stopServeEndTime = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_ENDTIME).getCode();
- //鏌ヨ褰撳墠鏃堕棿鏄惁鍦ㄥ仠姝腑
- long s = DateUtil.StringToDate(stopServeStartTime).getTime();
- long e = DateUtil.StringToDate(stopServeEndTime).getTime();
- if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
- homeResponse.setIsStopServe(Constants.ONE);
- }
- }
//鏌ヨ鏄惁瀛樺湪 宸叉敮浠樼殑 鎶奸噾璁㈠崟
Integer status = this.goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
@@ -547,7 +538,7 @@
String nowTime = DateUtil.getDate(new Date(),"HH:mm");
if(Integer.valueOf(nowTime.replace(":",""))<= Integer.valueOf(businessStartTime.replace(":",""))
||Integer.valueOf(nowTime.replace(":","")) > Integer.valueOf(businessEndTime.replace(":",""))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鏃堕棿鏆傛湭钀ヤ笟鏈嶅姟锛岃娉ㄦ剰鏌ョ湅钀ヤ笟鏃堕棿");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"钀ヤ笟鏃堕棿涓�06:00 ~ 23:59锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
}
}
@@ -563,7 +554,7 @@
long s = DateUtil.StringToDate(stopServeStartTime).getTime();
long e = DateUtil.StringToDate(stopServeEndTime).getTime();
if(e>System.currentTimeMillis()&&s<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠灏忕▼搴忓仠姝㈡湇鍔★紝璇锋敞鎰忔煡鐪嬪叕鍛�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.STOP_SERVE_TIPS).getCode());
}
}
}
@@ -610,30 +601,34 @@
ridesDetailResponse.setBikeType(pricingRule.getBikeType());
ridesDetailResponse.setDuration(durationSum);
ridesDetailResponse.setMemberRidesResponseList(collect);
+ Refund refund = new Refund();
- RefundDTO refundDTO = new RefundDTO();
- refundDTO.setOrderId(orderId);
- refundDTO.setCanBalance(goodsorder.getMoney());
- refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
- refundDTO.setTotalAmount(goodsorder.getMoney());
- refundDTO.setMemberId(goodsorder.getMemberId());
- refundDTO.setReason("鐢ㄦ埛涓诲姩閫�娆�");
- refundDTO.setType(Constants.REFUND_TYPE.NORMAL.getKey());
- Refund refund = wxMiniUtilService.wxRefund(refundDTO);
+ //鑻ユ秷璐归噾棰� 澶т簬 璁㈠崟鎶奸噾锛屽垯涓嶈繘琛岄��娆句笟鍔�
+ if(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())>Constants.ZERO){
+ RefundDTO refundDTO = new RefundDTO();
+ refundDTO.setOrderId(orderId);
+ refundDTO.setCanBalance(goodsorder.getMoney());
+ refundDTO.setRefundAmount(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
+ refundDTO.setTotalAmount(goodsorder.getMoney());
+ refundDTO.setMemberId(goodsorder.getMemberId());
+ refundDTO.setReason("鐢ㄦ埛涓诲姩閫�娆�");
+ refundDTO.setType(Constants.REFUND_TYPE.NORMAL.getKey());
+ refund = wxMiniUtilService.wxRefund(refundDTO);
+ }
+
//瀛樺偍 娑堣垂 浜ゆ槗娴佹按
-
Transactions transactions = new Transactions();
- transactions.setMemberId(refundDTO.getMemberId());
+ transactions.setMemberId(goodsorder.getMemberId());
transactions.setCreateDate(new Date());
transactions.setIsdeleted(Constants.ZERO);
- transactions.setOrderId(refundDTO.getOrderId());
- transactions.setMoney(ridesDetailResponse.getAmount());
+ transactions.setOrderId(orderId);
+ transactions.setMoney(goodsorder.getMoney().compareTo(ridesDetailResponse.getAmount())<=Constants.ZERO?goodsorder.getMoney():ridesDetailResponse.getAmount());
transactions.setType(Constants.transactionsType.consumption);
transactions.setDoneDate(new Date());
transactions.setTitle("娑堣垂缁撶畻");
transactions.setContent("缁撶畻瀹為檯娑堣垂");
transactions.setBalance(BigDecimal.ZERO);
- transactions.setObjId(refund.getId());
+ transactions.setObjId(orderId);
transactions.setObjType(Constants.ONE);
transactionsMapper.insert(transactions);
@@ -641,9 +636,9 @@
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
update.setCloseMoney(goodsorder.getMoney().subtract(ridesDetailResponse.getAmount()));
- update.setCloseId(refund.getId());
- update.setCloseDate(refund.getDoneDate());
- update.setCloseInfo(refund.getInfo());
+ update.setCloseId(!Objects.isNull(refund)?refund.getId():null);
+ update.setCloseDate(!Objects.isNull(refund)?refund.getDoneDate():null);
+ update.setCloseInfo(!Objects.isNull(refund)?refund.getInfo():null);
update.setCloseType(Constants.ONE);
goodsorderMapper.updateById(update);
}
--
Gitblit v1.9.3