From 3139292bd5e958ec735778a9ecc4b4fdef814fa8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 21 二月 2025 09:02:05 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 cf6ecb1..6e4d091 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
@@ -375,6 +375,7 @@
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()+"锛岃鍦ㄨ惀涓氭椂闂村唴浣跨敤鏈郴缁�");
+ homeResponse.setEleBusinessArea(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PARK_LAT_LNG_LIST).getCode());
homeResponse.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
@@ -404,6 +405,7 @@
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay)
+ .eq("type",0)
.last(" limit 1 "));
homeResponse.setDepositStatus(Constants.ZERO);
if(goodsorder!=null){
@@ -672,6 +674,7 @@
update.setCloseDate(new Date());
update.setCloseInfo(Constants.REFUND_TYPE.get(type).getInfo());
update.setCloseUserId(goodsorder.getEditor());
+ update.setType(Constants.ZERO);
if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
//濡傛灉鏄己鍒剁粨绠�
update.setCloseType(Constants.ONE);
@@ -832,7 +835,6 @@
if(discountMember.getSurplusTime() >= durationSum){
discountLog.setRideTime(durationSum);
discountLog.setRidePrice(closeMoney);
- discountLogMapper.insert(discountLog);
topRides.setActualPrice(BigDecimal.ZERO);
closeMoney = BigDecimal.ZERO;
}else{
@@ -1118,6 +1120,7 @@
qry.setStatus(Constants.goodsorderStatus.pay);
qry.setMemberId(memberId);
qry.setIsdeleted(Constants.ZERO);
+ qry.setType(Constants.ZERO);
if(goodsorderMapper.selectCount(new QueryWrapper<>(qry))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
@@ -1512,6 +1515,7 @@
* 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
* @param memberId
*/
+ @Override
public DiscountMember getUseDiscount(String memberId,Integer driveTime){
String today = DateUtil.getToday();
//鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
@@ -1522,12 +1526,12 @@
Integer holiday = holidaysMapper.selectCount(new QueryWrapper<>(holidays))>0?1:0;
List<DiscountMember> discountMemberList = discountMemberMapper.selectJoinList(DiscountMember.class,new MPJLambdaWrapper<DiscountMember>()
.selectAll(DiscountMember.class)
- .select(" select sum(d.ride_time) from discount_log d where and d.discount_member_id = discount_member.id " +
- "and d.isdeleted = 0 and d.type = 0 and EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) " , DiscountMember::getUseTime)//鏌ヨ浠婃棩宸蹭娇鐢ㄦ椂闂�
+ .select(" ( select sum(d.ride_time) from discount_log d where d.discount_member_id = t.id " +
+ "and d.isdeleted = 0 and d.type = 0 and EXTRACT(DAY FROM d.create_date) = EXTRACT(DAY FROM CURRENT_DATE) ) " , DiscountMember::getUseTime)//鏌ヨ浠婃棩宸蹭娇鐢ㄦ椂闂�
.eq(DiscountMember::getStatus,Constants.ZERO)
.eq(DiscountMember::getMemberId,memberId)
- .ge(DiscountMember::getUseStartDate, Utils.Date.getStart(DateUtil.stringToDate(today,"yyyy-MM-dd")))
- .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.stringToDate(today,"yyyy-MM-dd")))
+ .le(DiscountMember::getUseStartDate, Utils.Date.getStart(DateUtil.stringToDate(today,"yyyy-MM-dd")))
+ .ge(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.stringToDate(today,"yyyy-MM-dd")))
.eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
.orderByDesc(DiscountMember::getLimitType)
.orderByDesc(DiscountMember::getLimitTime)
@@ -1579,4 +1583,14 @@
}
+
+ public void autCancel(){
+ goodsorderMapper.update(null,new UpdateWrapper<Goodsorder>().lambda()
+ .set(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CANCEL.getKey())
+ .set(Goodsorder::getEditDate,DateUtil.getCurrDateTime())
+ .eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.UN_PAY.getKey())
+ .apply(" NOW() >= create_date + INTERVAL '30 min' ")
+ );
+ }
+
}
--
Gitblit v1.9.3