From 05bc0e7b6898dc56f45d2ac51d770883c68dadb1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 09:00:06 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 257 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 171 insertions(+), 86 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 89814e8..c451301 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
@@ -92,6 +92,9 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private BikesMapper bikesMapper;
+
@Autowired
@@ -121,6 +124,10 @@
@Autowired
RefundService refundService;
+
+ @Autowired
+ private HolidaysMapper holidaysMapper;
+
@Override
public String create(Goodsorder goodsorder) {
@@ -294,8 +301,8 @@
queryWrapper.selectAs(DiscountMember::getName, Goodsorder::getDiscountName);
queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
queryWrapper.leftJoin(DiscountMember.class, DiscountMember::getId ,Goodsorder::getObjId);
- queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status=2 ) as refund_date");
- queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status=2) as refund_money");
+ queryWrapper.select("(select max(r.done_date) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_date");
+ queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status in(0,2)) as refund_money");
//鏃堕棿娈电瓫閫�
if (Objects.nonNull(model.getStartDate())){
queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
@@ -303,15 +310,15 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
-
- queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
+ queryWrapper.eq(Constants.equalsInteger(model.getType(),Constants.ONE)&&model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
queryWrapper.like(model.getCode() !=null,Goodsorder::getCode,model.getCode());
queryWrapper.like(model.getId() !=null,Goodsorder::getId,model.getId());
queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
+ //濡傛灉鏄獞琛岃鍗曞彧鏄剧ず鏀粯鎴愬姛鐨�
+ queryWrapper.eq(Constants.equalsInteger(model.getType(),Constants.ZERO),Goodsorder::getPayStatus,Constants.ONE);
return queryWrapper;
}
@@ -323,6 +330,7 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
queryWrapper.orderByDesc(Goodsorder::getPayDate);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getType()),Goodsorder::getType,pageWrap.getModel().getType());
+
queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
"(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
queryWrapper.select("( select s.realname from refund r left join system_user s on r.creator = s.id where r.obj_id = t.id order by r.id desc limit 1 ) ",Goodsorder::getRefundUserName);
@@ -346,16 +354,11 @@
}
-
-
-
@Override
public long count(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectCount(wrapper);
}
-
-
@Override
public HomeResponse getHome(String memberId){
@@ -373,6 +376,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.setAdList(adMapper.selectList(new QueryWrapper<Ad>()
.eq("isdeleted",Constants.ZERO)
.eq("status",Constants.ZERO)
@@ -423,13 +427,14 @@
.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
.orderByDesc(MemberRides::getCreateDate)
.last(" limit 1 "));
- if (!Objects.isNull(memberRides)) {
+ if (Objects.nonNull(memberRides)) {
homeResponse.setRideStatus(memberRides.getStatus());
MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
BaseParam baseParam = baseParamMapper.selectById(memberRides.getParamId());
if(!Objects.isNull(baseParam)){
memberRidesResponse.setBikeType(baseParam.getName());
}
+ memberRidesResponse.setRidesType(memberRides.getType());
memberRidesResponse.setRideId(memberRides.getId());
memberRidesResponse.setRideStartTime(memberRides.getRentDate());
memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
@@ -445,13 +450,27 @@
memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
memberRidesResponse.getUnitPrice()
,memberRidesResponse.getUnitTime()));
+ if(Constants.equalsInteger(memberRides.getType(),Constants.ONE)){
+ Bikes bikes = bikesMapper.selectOne(new QueryWrapper<Bikes>().lambda().eq(Bikes::getCode,memberRides.getBikeCode()).eq(Bikes::getType,Constants.ONE).last("limit 1"));
+ memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
+ }
+ //鏌ヨ褰撳墠鐨勯獞琛屽椁�
+ memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO));
homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
}
-
-
return homeResponse;
+ }
+
+ @Override
+ public Integer getVoltageStatus(Bikes bikes){
+ //浣庣數閲忕數鍘�
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
+ if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
+ return 0;
+ }
+ return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
}
@@ -596,7 +615,7 @@
freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
}catch (Exception e){
}
- closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney()).getAmount();
+ closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId()).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
// memberRides.get(0).setActualPrice(closeMoney);
}
@@ -645,7 +664,7 @@
}
// BigDecimal closeMoney =( Constants.formatDecimalNum(goodsorder.getMoney()).subtract(refund.getMoney()));
//閫�娆句箰琛�
-// int type =Constants.formatIntegerNum(refund.getType());
+// int type =Constants.formatIntegerNum(refund.getType());
Goodsorder update = new Goodsorder();
update.setId(goodsorder.getId());
update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
@@ -713,70 +732,12 @@
doRefundTransactions(refund);
//閫�娆句箰琛�
int type =Constants.formatIntegerNum(refund.getType());
- Goodsorder goodsorder = goodsorderMapper.selectById(refund.getObjId());
- closeGoodsorderDoneNoRefund(goodsorder,refund.getType(),refund.getMoney(),refund.getId(),null);
- /* log.error("========================================"+JSONObject.toJSONString(goodsorder));
- if(goodsorder ==null || Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
- return;
+ 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(refund.getObjId());
- //榛樿缁撶畻涓烘娂閲戦噾棰�
- if (!CollectionUtils.isEmpty(memberRides)){
- //楠戣鎬绘椂闀�
- for(MemberRides model :memberRides){
- MemberRides up = new MemberRides();
- up.setId(model.getId());
- up.setActualPrice(model.getActualPrice());
- up.setCloseDate(goodsorder.getEditDate());
- up.setCloseStatus(Constants.ONE);
- up.setEditor(goodsorder.getEditor());
- up.setEditDate(goodsorder.getEditDate());
- //鏇存柊楠戣璁板綍鐨勮绠楅噾棰濆拰鐘舵��
- memberRidesJoinMapper.updateById(up);
- }
- }
-
- Goodsorder update = new Goodsorder();
- update.setId(goodsorder.getId());
- update.setStatus(Constants.GOODSORDER_STATUS.CLOSE.getKey());
- update.setCloseMoney(closeMoney);
- update.setCloseStatus(Constants.ONE);
- update.setCloseDate(new Date());
- update.setCloseInfo(Constants.REFUND_TYPE.get(refund.getType()).getInfo());
- update.setCloseUserId(goodsorder.getEditor());
- if(Constants.REFUND_TYPE.PLAT_FORCE.getKey() == type){
- //濡傛灉鏄己鍒剁粨绠�
- update.setCloseType(Constants.ONE);
-// LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-// update.setEditor(principal.getId());
- }else if(Constants.REFUND_TYPE.NORMAL.getKey() == type){
- //濡傛灉鏄嚜琛岀祼绠�
- update.setCloseType(Constants.ZERO);
- }else{
- //濡傛灉鏄钩鍙拌嚜鍔ㄧ粨绠�
- update.setCloseType(Constants.TWO);
- }
- update.setCloseId(refund.getId());
- //瀛樺偍 娑堣垂浜ゆ槗娴佹按
- Transactions transactions = new Transactions();
- transactions.setId(Constants.getUUID());
- transactions.setMemberId(goodsorder.getMemberId());
- transactions.setCreateDate(new Date());
- transactions.setIsdeleted(Constants.ZERO);
- transactions.setOrderId(goodsorder.getId());
- transactions.setMoney(goodsorder.getMoney().subtract(Constants.formatDecimalNum(refund.getMoney())));
- transactions.setType(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getKey());
- transactions.setDoneDate(new Date());
- transactions.setTitle(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getName());
- transactions.setContent(Constants.TRANSACTIONS_TYPE.CONSUMPTION.getInfo());
- transactions.setBalance(BigDecimal.ZERO);
- transactions.setObjId(goodsorder.getId());
- transactions.setObjType(Constants.ONE);
- transactionsMapper.insert(transactions);
- //淇敼璁㈠崟淇℃伅
- goodsorderMapper.updateById(update);*/
- }
+ }
private void doRefundTransactions(Refund refund ) {
//瀛樺偍浜ゆ槗娴佹按琛�
@@ -818,11 +779,13 @@
transactionsMapper.insert(transactions);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney) {
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
+ ridesDetailResponse.setHaveDisCount(Constants.ZERO);
BigDecimal closeMoney = new BigDecimal(0.00);
int durationSum = 0;
MemberRides topRides =null;
+
//鍙栨渶楂樿溅鍨嬭绠楁柟妗堢粨绠楄鍗�
for(MemberRides rides : memberRides){
if ( isClose && Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()!=(Constants.formatIntegerNum(rides.getStatus()))){
@@ -836,7 +799,8 @@
}
}
}
-// MemberRides topRides =memberRides.get(0);
+
+ //璁＄畻搴斾粯閲戦
if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -850,6 +814,49 @@
}
}
topRides.setActualPrice(closeMoney);
+ }
+ //鏌ヨ鏄惁瀛樺湪濂楅淇℃伅
+ DiscountMember discountMember = this.getUseDiscount(memberId,durationSum);
+ //璁＄畻鎶垫墸閲戦
+ if(Objects.nonNull(discountMember) && discountMember.getSurplusTime() > Constants.ZERO && Objects.nonNull(topRides)){
+ //瀛樺偍鎶垫墸璁板綍
+ DiscountLog discountLog = new DiscountLog();
+ discountLog.setIsdeleted(Constants.ZERO);
+ discountLog.setCreator(memberId);
+ discountLog.setCreateDate(new Date());
+ discountLog.setDiscountMemberId(discountMember.getId());
+ discountLog.setType(Constants.ZERO);
+ discountLog.setInfo("楠戣鎶垫墸");
+ discountLog.setEditInfo("楠戣鎶垫墸");
+ discountLog.setGoodsorderId(topRides.getOrdreId());
+ //濡傛灉楠戣鏃堕棿灏忎簬绛変簬鍓╀綑鏃堕棿 鍒欑洿鎺ユ坊鍔� 楠戣鍗′娇鐢ㄦ暟鎹� 淇瀹為檯鏀粯閲戦
+ if(discountMember.getSurplusTime() >= durationSum){
+ discountLog.setRideTime(durationSum);
+ discountLog.setRidePrice(closeMoney);
+ discountLogMapper.insert(discountLog);
+ topRides.setActualPrice(BigDecimal.ZERO);
+ closeMoney = BigDecimal.ZERO;
+ }else{
+ int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
+ BigDecimal closeDisCountMoney = Constants.formatDecimalNum(topRides.getBasePrice());
+ //濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
+ Integer durationDisCountSum = durationSum - discountMember.getSurplusTime();
+ discountLog.setRideTime(discountMember.getSurplusTime());
+ if(baseTime != -1){//涓嶆槸涓�鍙ｄ环
+ if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
+ //濡傛灉瓒呭嚭浜嗚捣姝ヤ环鏍硷紝璁＄畻瓒呭嚭浠锋牸
+ BigDecimal unit = new BigDecimal(durationSum-baseTime).divide(new BigDecimal(topRides.getUnitTime()), 0, BigDecimal.ROUND_UP);
+ //璁＄畻閲戦绱瓒呭嚭閮ㄩ棬浠锋牸锛堣秴鍑烘椂闂村崟浣�*瓒呭嚭鍗曚綅鏃堕棿浠锋牸锛�
+ closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
+ }
+ discountLog.setRidePrice(closeMoney.subtract(closeDisCountMoney));
+ }else{
+ discountLog.setRidePrice(BigDecimal.ZERO);
+ }
+ }
+ discountLogMapper.insert(discountLog);
+ ridesDetailResponse.setHaveDisCount(Constants.ONE);
+ ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
}
//濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -867,7 +874,6 @@
wrapper.eq(MemberRides::getOrdreId,id);
wrapper.ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey());
wrapper.selectAll(MemberRides.class)
- .select("select b.device_sn from bikes b where b.isdeleted=0 and b.code = t.bike_code limit 1",MemberRides::getDeviceSn)
.selectAs(BaseParam::getSortnum, MemberRides::getSortnum)
.selectAs(BaseParam::getName, MemberRides::getParamName);
wrapper.leftJoin(BaseParam.class, BaseParam::getId, MemberRides::getParamId);
@@ -892,13 +898,18 @@
if(goodsorder == null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璁㈠崟淇℃伅涓嶅瓨鍦紝璇峰埛鏂伴〉闈㈤噸璇曪紒");
}
- if (Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.CLOSE.getKey()){
+ if (Constants.equalsInteger(goodsorder.getType(),Constants.ZERO) &&
+ Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.CLOSE.getKey()){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曡缁撶畻鍚庡啀閫�娆緙");
+ }
+ if (Constants.equalsInteger(goodsorder.getType(),Constants.ONE) &&
+ Constants.formatIntegerNum(goodsorder.getStatus()) != Constants.GOODSORDER_STATUS.HAVING_PAY.getKey()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヨ鍗曡鏀粯鍚庡啀閫�娆緙");
}
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Refund::getObjId,goodsorderBackDTO.getOrderId())
- .eq(Refund::getStatus,Constants.TWO)
+ .in(Refund::getStatus,Constants.TWO,Constants.ZERO)
.eq(Refund::getIsdeleted,Constants.ZERO) ;
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
@@ -917,7 +928,10 @@
refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
//閫�璐ч��娆� 鏌ョ湅濂楅璁㈠崟鐘舵�� 鏇存柊璁㈠崟淇℃伅
if(Constants.equalsInteger(goodsorderBackDTO.getBackType(),Constants.ZERO)&&Constants.equalsInteger(goodsorder.getType(),Constants.ONE)){
- DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda().
+ eq(DiscountMember::getGoodsorderId,goodsorder.getId())
+ .eq(DiscountMember::getIsdeleted,Constants.ZERO)
+ .last("limit 1"));
if(Objects.isNull(discountMember)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌濂楅鍗′俊鎭�");
}
@@ -956,7 +970,7 @@
QueryWrapper<Refund> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Refund::getObjId,orderId)
- .eq(Refund::getStatus,Constants.TWO)
+ .in(Refund::getStatus,Constants.TWO,Constants.ZERO)
.eq(Refund::getIsdeleted,Constants.ZERO) ;
wrapper.select("sum(money) as money").last(" limit 1");
Refund total = refundMapper.selectOne(wrapper);
@@ -1083,7 +1097,7 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney());
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId());
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1495,4 +1509,75 @@
}
+ /**
+ * 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
+ * @param memberId
+ */
+ public DiscountMember getUseDiscount(String memberId,Integer driveTime){
+ String today = DateUtil.getToday();
+ //鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
+ Holidays holidays = new Holidays();
+ holidays.setHoliday(today);
+ holidays.setIsdeleted(Constants.ZERO);
+ //鏄惁鏄妭鍋囨棩 1=鏄紱0=鍚�
+ 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)//鏌ヨ浠婃棩宸蹭娇鐢ㄦ椂闂�
+ .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")))
+ .eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
+ .orderByDesc(DiscountMember::getLimitType)
+ .orderByDesc(DiscountMember::getLimitTime)
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountMemberList)){
+ //鏌ョ湅鏄惁鏈夋棤鏈熼檺鐨勫椁� 濡傛灉瀛樺湪 鍒欑洿鎺ヨ繑鍥炴棤鏈熼檺鐨勫椁�
+ Optional<DiscountMember> optional = discountMemberList.stream().filter(i->Constants.equalsInteger(i.getLimitType(),Constants.ZERO)).findAny();
+ if(optional.isPresent()){
+ return optional.get();
+ }
+ //澶勭悊鍓╀綑鏃堕棿
+ for (DiscountMember discountMember:discountMemberList) {
+ if(Objects.isNull(discountMember.getUseTime())){
+ discountMember.setSurplusTime(discountMember.getLimitTime());
+ }else if(discountMember.getUseTime()>=discountMember.getLimitTime()){
+ discountMember.setSurplusTime(0);
+ }else{
+ discountMember.setSurplusTime(discountMember.getLimitTime() - discountMember.getUseTime());
+ }
+ }
+ //楠戣涓� 鏄剧ず鍓╀綑鏃堕棿鏈�澶х殑
+ if(Constants.equalsInteger(driveTime,Constants.ZERO)){
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>0).collect(Collectors.toList());
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }else{
+ //鏃犳棤鏈熼檺鐨勫椁� 浼樺厛鏌ヨ鍓╀綑鏃堕暱澶т簬楠戣鏃堕暱鐨勪俊鎭�(鍙栨椂闂存渶灏忕殑濂楅) 鍐嶆煡璇㈠皬浜庨獞琛屾椂闀跨殑濂楅
+ List<DiscountMember> list = discountMemberList.stream().filter(i->i.getSurplusTime()>=driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ //d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }
+ list = discountMemberList.stream().filter(i->i.getSurplusTime()<driveTime).collect(Collectors.toList());
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
+ if(list.size()>Constants.ZERO){
+ list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
+ }
+ return list.get(Constants.ZERO);
+ }
+ }
+ }
+ return null;
+ }
+
+
}
--
Gitblit v1.9.3