From 18cf2f252338e52fb531cd2ca1cc49e39bf6efe0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 19 二月 2025 18:50:50 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 368 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 340 insertions(+), 28 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 33d39cf..81955cc 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
@@ -34,6 +34,7 @@
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.MemberRidesService;
import com.doumee.service.business.PricingRuleService;
@@ -48,6 +49,7 @@
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.A;
import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -81,12 +83,17 @@
@Autowired
private DiscountLogMapper discountLogMapper;
+ @Autowired
+ private DiscountMapper discountMapper;
@Autowired
GoodsorderJoinMapper goodsorderJoinMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private BikesMapper bikesMapper;
@@ -117,6 +124,10 @@
@Autowired
RefundService refundService;
+
+ @Autowired
+ private HolidaysMapper holidaysMapper;
+
@Override
public String create(Goodsorder goodsorder) {
@@ -200,13 +211,6 @@
if (Objects.nonNull(model.getEndDate())){
queryWrapper.le( Goodsorder::getPayDate, Utils.Date.getEnd(model.getEndDate()));
}
-
-// queryWrapper.eq(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.orderByAsc(Goodsorder::getPayDate);
@@ -328,6 +332,7 @@
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);
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
@@ -348,16 +353,11 @@
}
-
-
-
@Override
public long count(Goodsorder goodsorder) {
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectCount(wrapper);
}
-
-
@Override
public HomeResponse getHome(String memberId){
@@ -375,11 +375,25 @@
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)
.orderByAsc("sortnum")
));;
+ homeResponse.setDiscountList(
+ discountMapper.selectList(new QueryWrapper<Discount>().lambda()
+ .eq(Discount::getIsdeleted,Constants.ZERO)
+ .eq(Discount::getStatus,Constants.ZERO)
+ .orderByDesc(Discount::getId)
+ .last(" limit 3 ")
+ )
+ );
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(homeResponse.getDiscountList())){
+ for (Discount discount:homeResponse.getDiscountList()) {
+ discount.setDayPrice(discount.getPrice().divide(new BigDecimal(Integer.toString(discount.getUseDays())),2));
+ }
+ }
if(!Objects.isNull(homeResponse.getAdList())&&homeResponse.getAdList().size()>Constants.ZERO){
homeResponse.getAdList().forEach(i->{
i.setImgfullurl(fullPath + i.getImgurl());
@@ -412,13 +426,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"));
@@ -434,19 +449,32 @@
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;
}
@Override
public GoodsorderDetailDTO getGoodsorderDetailDTO(String id) {
-
List<PayOrderDTO> payOrderDTOList = new ArrayList<>();
Goodsorder goodsorder = goodsorderMapper.selectById(id);
if(goodsorder == null){
@@ -495,6 +523,45 @@
goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄
return goodsorderDetailDTO;
}
+
+
+
+ @Override
+ public GoodsorderDetailVO getGoodsorderDetailForDisCount(String id){
+ GoodsorderDetailVO goodsorderDetailVO = new GoodsorderDetailVO();
+ Goodsorder goodsorder = goodsorderMapper.selectById(id);
+ if(goodsorder == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY );
+ }
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ goodsorderDetailVO.setGoodsOrder(goodsorder);
+ Member member = memberMapper.selectById(goodsorder.getMemberId());
+ if(Objects.nonNull(member)){
+ goodsorderDetailVO.setMember(member);
+ }
+ //鏌ヨ鍟嗗搧淇℃伅
+ DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ if(Objects.nonNull(discountMember)){
+ goodsorderDetailVO.setDiscountMember(discountMember);
+ }
+ //鏌ヨ鎵�鏈夋湁閫�娆捐褰�
+ List<Refund> refunds = refundJoinMapper.selectJoinList(Refund.class,
+ new MPJLambdaWrapper<Refund>()
+ .selectAll(Refund.class)
+ .selectAs(SystemUser::getRealname,Refund::getCreatorName)
+ .leftJoin(SystemUser.class,SystemUser::getId,Refund::getCreator)
+ .eq(Refund::getObjId,goodsorder.getId())
+ .orderByDesc(Refund::getId)
+ );
+ goodsorderDetailVO.setRefundList(refunds);
+
+ return goodsorderDetailVO;
+ }
+
+
+
@Override
public void forceCloseGoodsorder(String orderId) {
//鏌ヨ璁㈠崟 淇℃伅
@@ -547,7 +614,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);
}
@@ -769,11 +836,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()))){
@@ -787,7 +856,8 @@
}
}
}
-// MemberRides topRides =memberRides.get(0);
+
+ //璁＄畻搴斾粯閲戦
if( topRides != null){
int baseTime =Constants.formatIntegerNum(topRides.getBaseTime());
closeMoney = Constants.formatDecimalNum(topRides.getBasePrice());
@@ -801,6 +871,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){
@@ -1033,7 +1146,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());
@@ -1071,6 +1184,7 @@
goodsorder.setCreateDate(new Date());
goodsorder.setIsdeleted(Constants.ZERO);
goodsorder.setCode(goodsorder.getId());
+ goodsorder.setType(Constants.ZERO);
goodsorder.setMemberId(memberId);
goodsorder.setMoney(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()).multiply(new BigDecimal(100)));
goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
@@ -1085,16 +1199,101 @@
} catch (Exception e) {
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
}
-
return response;
}
- private Object getWxPayResponse(Goodsorder goodsorder,String openid) throws Exception {
+
+ @Override
+ public Object createDiscountOrderPay(String memberId,String discountId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛瀵硅薄淇℃伅");
+ }
+ Discount discount = discountMapper.selectById(discountId);
+ this.checkDiscountSaleDate(discount);
+ String discountMemberId = Constants.getUUID();
+ String goodsorderId = Constants.getUUID();
+ DiscountMember discountMember = new DiscountMember();
+ BeanUtils.copyProperties(discount,discountMember);
+ discountMember.setCreator(null);
+ discountMember.setId(discountMemberId);
+ discountMember.setCreateDate(new Date());
+ discountMember.setEditDate(new Date());
+ discountMember.setEditor(null);
+ discountMember.setMemberId(memberId);
+ discountMember.setStatus(Constants.TWO);
+ discountMember.setGoodsorderId(goodsorderId);
+ discountMemberMapper.insert(discountMember);
+
+ Goodsorder goodsorder = new Goodsorder();
+ goodsorder.setId(goodsorderId);
+ goodsorder.setCreateDate(new Date());
+ goodsorder.setIsdeleted(Constants.ZERO);
+ goodsorder.setCode(goodsorder.getId());
+ goodsorder.setMemberId(memberId);
+ goodsorder.setType(Constants.ONE);
+ goodsorder.setMoney(discount.getPrice().multiply(new BigDecimal(100)));
+ goodsorder.setStatus(Constants.goodsorderStatus.waitPay);
+ goodsorder.setPreOrderid(goodsorder.getId());
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.waitPay);
+ goodsorder.setPayWay(Constants.ZERO);
+ goodsorder.setObjType(Constants.ZERO);
+ goodsorder.setObjId(discount.getId());
+ this.goodsorderMapper.insert(goodsorder);
//璋冭捣鏀粯
- Object response = null;
+ Object response = null;
+ try {
+ response = getWxPayResponse(goodsorder,member.getOpenid());
+ } catch (Exception e) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鍙戣捣鏀粯澶辫触~");
+ }
+ return response;
+
+ }
+
+ public void checkDiscountSaleDate(Discount discount){
+ if(Objects.isNull(discount)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌濂楅淇℃伅");
+ }
+ if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO)
+ ||Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅宸蹭笅鏋讹紝鏃犳硶杩涜璐拱锛岃鍒锋柊鏌ョ湅");
+ }
+ if(!(discount.getStartDate().getTime() < System.currentTimeMillis()
+ && Utils.Date.getEnd(discount.getEndDate()).getTime() > System.currentTimeMillis() )){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅寮�鏀炬椂闂存湭鍒�,鏃犳硶杩涜璐拱");
+ }
+ //楠岃瘉鏄惁瓒呰繃浠婃棩鍙敭鍗栨暟閲�
+ if(Objects.nonNull(discount.getSaleDayLimit())){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ .apply(" EXTRACT(DAY FROM create_date) = EXTRACT(DAY FROM CURRENT_DATE) ")
+ )>=discount.getSaleDayLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅浠婃棩鍙戣閲忓凡鍞絼锛岃鏄庢棩鏌ョ湅锛�");
+ }
+ }
+ if(Objects.nonNull(discount.getSaleLimit())){
+ if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
+ .eq(Goodsorder::getType,Constants.ONE)
+ .eq(Goodsorder::getObjId,discount.getId())
+ .in(Goodsorder::getStatus,Constants.ZERO,Constants.ONE)
+ .apply(" EXTRACT(YEAR FROM create_date) = EXTRACT(YEAR FROM CURRENT_DATE) ")
+ )>=discount.getSaleDayLimit()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅鍙戣閲忓凡鍞絼锛�");
+ }
+ }
+ }
+
+
+
+ private Object getWxPayResponse(Goodsorder goodsorder,String openid){
+ //璋冭捣鏀粯
+ Object response = null;
PrepayRequest request = new PrepayRequest();
request.setAttach("createGoodsOrder");
- request.setDescription("妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�");
+ request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�":"妫灄鍏洯鑷杞﹁喘涔伴獞琛屽椁愭敮浠�");
request.setSpMchid(WxMiniConfig.wxProperties.getMchId());
request.setSpAppid(WxMiniConfig.wxProperties.getAppId());
request.setSubMchid(WxMiniConfig.wxProperties.getSubMchId());
@@ -1111,10 +1310,10 @@
// 璺熶箣鍓嶄笅鍗曠ず渚嬩竴鏍凤紝濉厖棰勪笅鍗曞弬鏁�
PrepayWithRequestPaymentResponse resParam = WxMiniConfig.jsapiExtService.prepayWithRequestPayment(request,WxMiniConfig.wxProperties.getSubAppId());
response =resParam;
-
return response;
-
}
+
+
/**
@@ -1240,6 +1439,50 @@
return ("澶勭悊鎴愬姛!");
}
goodsorder.setOnlineOrderid(paymentNo);
+ if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
+ this.dealGoodsOrderCallBack(goodsorder);
+ }else{
+ this.dealDiscountOrderCallBack(goodsorder);
+ }
+ return ("澶勭悊鎴愬姛!");
+ }
+
+ public void dealDiscountOrderCallBack(Goodsorder goodsorder){
+ goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
+ goodsorder.setStatus(Constants.goodsorderStatus.pay);
+ goodsorder.setPayDate(new Date());
+ goodsorder.setEditDate(new Date());
+ goodsorderMapper.updateById(goodsorder);
+
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()).last(" limit 1 "));
+ discountMemberMapper.update(null,new UpdateWrapper<DiscountMember>().lambda()
+ .set(DiscountMember::getStatus,Constants.ZERO)
+ .eq(DiscountMember::getId,discountMember.getId())
+ );
+ Constants.TRANSACTIONS_TYPE discountConstants = Constants.TRANSACTIONS_TYPE.DISCOUNT;
+ //瀛樺偍浜ゆ槗娴佹按琛�
+ Transactions transactions = new Transactions();
+ transactions.setMemberId(goodsorder.getMemberId());
+ transactions.setCreateDate(new Date());
+ transactions.setIsdeleted(Constants.ZERO);
+ transactions.setOrderId(goodsorder.getId());
+ transactions.setMoney(goodsorder.getMoney());
+ transactions.setType(discountConstants.getKey());
+ transactions.setPreOrderid(goodsorder.getPreOrderid());
+ transactions.setOnlineOrderid(goodsorder.getOnlineOrderid());
+ transactions.setDoneDate(new Date());
+ transactions.setTitle(discountConstants.getName());
+ transactions.setContent(discountConstants.getInfo());
+ //transactions.setContent(discountMember.getName() +" 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
+ transactions.setBalance(goodsorder.getMoney());
+ transactions.setObjId(discountMember.getId());
+ transactions.setObjType(Constants.TWO);
+ transactionsMapper.insert(transactions);
+ }
+
+
+ public void dealGoodsOrderCallBack(Goodsorder goodsorder){
goodsorder.setPayStatus(Constants.goodsorderPayStatus.pay);
goodsorder.setStatus(Constants.goodsorderStatus.pay);
goodsorder.setPayDate(new Date());
@@ -1262,9 +1505,7 @@
transactions.setObjId(goodsorder.getId());
transactions.setObjType(Constants.ZERO);
transactionsMapper.insert(transactions);
- return ("澶勭悊鎴愬姛!");
}
-
/**
@@ -1317,4 +1558,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)))
+ .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.StringToDate(today)))
+ .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