From 97f0349543ba83e6cdf69d99328f811bee40102e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 05 三月 2025 14:46:07 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 227 ++++++++++++++++++++++++++++----------------------------
1 files changed, 115 insertions(+), 112 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 c5bed2e..73e444b 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
@@ -73,8 +73,6 @@
@Slf4j
public class GoodsorderServiceImpl implements GoodsorderService {
-
-
@Autowired
private GoodsorderMapper goodsorderMapper;
@@ -259,7 +257,6 @@
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
queryWrapper.orderByAsc(Goodsorder::getPayDate);
goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
-
}else{
MPJLambdaWrapper<Refund> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAs(Refund::getMoney,GoodsorderExportVO::getRefundMoney);
@@ -300,9 +297,10 @@
queryWrapper.selectAs(Member::getOpenid, Goodsorder::getOpenid);
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.leftJoin(DiscountMember.class, DiscountMember::getGoodsorderId ,Goodsorder::getId);
+// queryWrapper.select("(select r.name from discount_member r where r.isdeleted=0 and r.goodsorder_id=t.id limit 1) as discountName");
+ 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()));
@@ -310,15 +308,17 @@
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.eq(model.getPayWay() !=null,Goodsorder::getPayWay,model.getPayWay());
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);
+ queryWrapper.in(Constants.equalsInteger(model.getType(),Constants.ONE),Goodsorder::getStatus,Constants.ONE,Constants.ZERO);
return queryWrapper;
}
@@ -330,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);
@@ -339,7 +340,7 @@
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ONE)){
queryWrapper.eq(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDiscountName()),Goodsorder::getDiscountName,pageWrap.getModel().getDiscountName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getDiscountName()),DiscountMember::getName,pageWrap.getModel().getDiscountName());
IPage<Goodsorder> goodsorderIPage = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
if (!CollectionUtils.isEmpty(goodsorderIPage.getRecords())){
goodsorderIPage.getRecords().forEach(s->{
@@ -351,7 +352,6 @@
}
return PageData.from(goodsorderIPage);
}
-
@Override
public long count(Goodsorder goodsorder) {
@@ -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)
@@ -385,6 +386,7 @@
discountMapper.selectList(new QueryWrapper<Discount>().lambda()
.eq(Discount::getIsdeleted,Constants.ZERO)
.eq(Discount::getStatus,Constants.ZERO)
+ .apply(" now() BETWEEN start_date and ( end_date + INTERVAL '1 day' ) ")
.orderByDesc(Discount::getId)
.last(" limit 3 ")
)
@@ -404,6 +406,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){
@@ -454,7 +457,7 @@
memberRidesResponse.setVoltageStatus(this.getVoltageStatus(bikes));
}
//鏌ヨ褰撳墠鐨勯獞琛屽椁�
- memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO));
+ memberRidesResponse.setDiscountMember(this.getUseDiscount(memberId,Constants.ZERO,memberRides.getType()));
homeResponse.setMemberRidesResponse(memberRidesResponse);
}
}
@@ -465,11 +468,11 @@
@Override
public Integer getVoltageStatus(Bikes bikes){
//浣庣數閲忕數鍘�
- BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_VOLTAGE).getCode());
+ BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.LOW_BIKE_VOLTAGE).getCode());
if(Objects.isNull(bikes)||Objects.isNull(bikes.getVoltage())||Objects.isNull(lowVoltage)){
return 0;
}
- return bikes.getVoltage().compareTo(lowVoltage)>0?0:1;
+ return bikes.getVoltage().compareTo(lowVoltage)>=0?0:1;
}
@@ -536,13 +539,16 @@
if(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED);
}
+ goodsorder.setMoney(Constants.translateMoney(goodsorder.getMoney()));
goodsorderDetailVO.setGoodsOrder(goodsorder);
Member member = memberMapper.selectById(goodsorder.getMemberId());
if(Objects.nonNull(member)){
goodsorderDetailVO.setMember(member);
}
//鏌ヨ鍟嗗搧淇℃伅
- DiscountMember discountMember = discountMemberMapper.selectById(goodsorder.getObjId());
+ DiscountMember discountMember = discountMemberMapper.selectOne(new QueryWrapper<DiscountMember>().lambda()
+ .eq(DiscountMember::getIsdeleted,Constants.ZERO)
+ .eq(DiscountMember::getGoodsorderId,goodsorder.getId()));
if(Objects.nonNull(discountMember)){
goodsorderDetailVO.setDiscountMember(discountMember);
}
@@ -555,6 +561,13 @@
.eq(Refund::getObjId,goodsorder.getId())
.orderByDesc(Refund::getId)
);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(refunds)){
+ for (Refund refund:refunds) {
+ if(Objects.nonNull(refund.getMoney())){
+ refund.setMoney(Constants.translateMoney(refund.getMoney()));
+ }
+ }
+ }
goodsorderDetailVO.setRefundList(refunds);
return goodsorderDetailVO;
@@ -614,7 +627,7 @@
freeTime = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
}catch (Exception e){
}
- closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId()).getAmount();
+ closeMoney = getCloseMoneyByRides(memberRides,freeTime,true,goodsorder.getMoney(),goodsorder.getMemberId(),true).getAmount();
//瀹為檯缁撶畻浠锋牸锛岃褰曞湪鏈�楂樿溅鍨嬭褰曚笂
// memberRides.get(0).setActualPrice(closeMoney);
}
@@ -672,6 +685,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);
@@ -731,70 +745,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 ) {
//瀛樺偍浜ゆ槗娴佹按琛�
@@ -836,7 +792,7 @@
transactionsMapper.insert(transactions);
}
- private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId) {
+ private RidesDetailResponse getCloseMoneyByRides(List<MemberRides> memberRides,int freeTime,boolean isClose,BigDecimal yjMoney,String memberId,Boolean unOver) {
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
ridesDetailResponse.setHaveDisCount(Constants.ZERO);
BigDecimal closeMoney = new BigDecimal(0.00);
@@ -873,9 +829,10 @@
topRides.setActualPrice(closeMoney);
}
//鏌ヨ鏄惁瀛樺湪濂楅淇℃伅
- DiscountMember discountMember = this.getUseDiscount(memberId,durationSum);
+ DiscountMember discountMember = this.getUseDiscount(memberId,durationSum,Objects.nonNull(topRides)?topRides.getType():null);
//璁＄畻鎶垫墸閲戦
- if(Objects.nonNull(discountMember) && discountMember.getSurplusTime() > Constants.ZERO && Objects.nonNull(topRides)){
+ //unOver 鏄惁鏈粨绠� 鏈粨绠楃殑璁㈠崟鏍规嵁褰撳墠濂楅鏌ヨ 宸茬粨绠楃殑璁㈠崟鏍规嵁宸茬敓鎴愮殑鏁版嵁杩涜鏌ヨ
+ if(Objects.nonNull(discountMember) && Objects.nonNull(topRides) && unOver){
//瀛樺偍鎶垫墸璁板綍
DiscountLog discountLog = new DiscountLog();
discountLog.setIsdeleted(Constants.ZERO);
@@ -887,18 +844,18 @@
discountLog.setEditInfo("楠戣鎶垫墸");
discountLog.setGoodsorderId(topRides.getOrdreId());
//濡傛灉楠戣鏃堕棿灏忎簬绛変簬鍓╀綑鏃堕棿 鍒欑洿鎺ユ坊鍔� 楠戣鍗′娇鐢ㄦ暟鎹� 淇瀹為檯鏀粯閲戦
- if(discountMember.getSurplusTime() >= durationSum){
+ if(Constants.equalsInteger(discountMember.getLimitType(),Constants.ZERO) || 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());
+ discountLog.setRideTime(durationDisCountSum<=Constants.ZERO?discountMember.getSurplusTime():Constants.ZERO);
+ //濡傛灉鏄竴鍙ｄ环鏂瑰紡锛屼环鏍肩洿鎺ヤ负涓�鍙ｄ环baseMoney,濡傛灉涓嶆槸璁＄畻姝ｅ父浠锋牸
if(baseTime != -1){//涓嶆槸涓�鍙ｄ环
if(durationDisCountSum > baseTime && Constants.formatIntegerNum(topRides.getUnitTime())>0){
//濡傛灉瓒呭嚭浜嗚捣姝ヤ环鏍硷紝璁＄畻瓒呭嚭浠锋牸
@@ -906,14 +863,25 @@
//璁＄畻閲戦绱瓒呭嚭閮ㄩ棬浠锋牸锛堣秴鍑烘椂闂村崟浣�*瓒呭嚭鍗曚綅鏃堕棿浠锋牸锛�
closeDisCountMoney = closeDisCountMoney.add(unit.multiply(Constants.formatDecimalNum(topRides.getUnitPrice())));
}
- discountLog.setRidePrice(closeMoney.subtract(closeDisCountMoney));
+ discountLog.setRidePrice(durationDisCountSum<=Constants.ZERO?closeMoney.subtract(closeDisCountMoney):BigDecimal.ZERO);
}else{
discountLog.setRidePrice(BigDecimal.ZERO);
}
}
- discountLogMapper.insert(discountLog);
- ridesDetailResponse.setHaveDisCount(Constants.ONE);
+ if(isClose&&discountLog.getRideTime()>Constants.ZERO){
+ discountLogMapper.insert(discountLog);
+ }
+ ridesDetailResponse.setHaveDisCount(discountLog.getRideTime()>Constants.ZERO?Constants.ONE:Constants.ZERO);
ridesDetailResponse.setDisCountMoney(discountLog.getRidePrice());
+ }else if(Objects.nonNull(discountMember) && Objects.nonNull(topRides)
+ && !unOver ){
+ //宸茶繕杞﹀垯鏌ヨ鏄惁鏈� 濂楅鍗′娇鐢ㄨ褰�
+ List<DiscountLog> discountLogList = discountLogMapper.selectList(new QueryWrapper<DiscountLog>().lambda().eq(DiscountLog::getGoodsorderId,topRides.getOrdreId()).eq(DiscountLog::getType,Constants.ZERO)
+ .eq(DiscountLog::getIsdeleted,Constants.ZERO));
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(discountLogList)){
+ ridesDetailResponse.setHaveDisCount(Constants.ONE);
+ ridesDetailResponse.setDisCountMoney(discountLogList.stream().map(i->i.getRidePrice()).reduce(BigDecimal.ZERO,BigDecimal::add));
+ }
}
//濡傛灉璁㈠崟浠锋牸灏侀《浜嗭紝鍙栬鍗� 浠锋牸
if(Constants.compareBigdecimal(closeMoney, yjMoney) ==1){
@@ -946,7 +914,6 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(goodsorderBackDTO)
|| StringUtils.isBlank(goodsorderBackDTO.getOrderId())
- || StringUtils.isBlank(goodsorderBackDTO.getReason())
|| Objects.isNull(goodsorderBackDTO.getBackType())
|| Objects.isNull(goodsorderBackDTO.getMoney())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -955,13 +922,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);
@@ -980,7 +952,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(),"鏈煡璇㈠埌濂楅鍗′俊鎭�");
}
@@ -1019,7 +994,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);
@@ -1110,7 +1085,8 @@
.selectAs(BaseParam::getSortnum,MemberRides::getSortnum)
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.eq(MemberRides::getOrdreId,id)
- .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
+ .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey()
+ ,Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey(),Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
.orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
@@ -1146,7 +1122,8 @@
return memberRidesResponse;
}).collect(Collectors.toList());
//绱鍜岄绠楃粨绠楅噾棰�
- RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId());
+ RidesDetailResponse ridesDetailResponse = getCloseMoneyByRides(memberRides,freeTime,false,goodsorder.getMoney(),goodsorder.getMemberId(),
+ Constants.equalsInteger(goodsorder.getStatus(),Constants.GOODSORDER_STATUS.CLOSE.getKey())?false:true);
if(Constants.formatIntegerNum(goodsorder.getStatus())!= Constants.goodsorderStatus.pay){
//濡傛灉闈炲凡鏀粯浣嗘湭缁撶畻锛屼娇鐢ㄨ鍗曢噾棰�
ridesDetailResponse.setAmount(goodsorder.getCloseMoney());
@@ -1168,6 +1145,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(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
@@ -1223,8 +1201,13 @@
discountMember.setMemberId(memberId);
discountMember.setStatus(Constants.TWO);
discountMember.setGoodsorderId(goodsorderId);
+ if(!Constants.equalsInteger(discountMember.getUseType(),Constants.ZERO)){
+ if(Constants.equalsInteger(discountMember.getUseType(),Constants.ONE)){
+ discountMember.setUseStartDate(DateUtil.StringToDateFormat(DateUtil.getCurrDate(),"yyyy-MM-dd"));
+ }
+ discountMember.setUseEndDate( DateUtil.StringToDateFormat(DateUtil.getXDaysAfter(discountMember.getUseStartDate(),discountMember.getUseDays()-1),"yyyy-MM-dd"));
+ }
discountMemberMapper.insert(discountMember);
-
Goodsorder goodsorder = new Goodsorder();
goodsorder.setId(goodsorderId);
goodsorder.setCreateDate(new Date());
@@ -1256,7 +1239,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌濂楅淇℃伅");
}
if(!(Constants.equalsInteger(discount.getIsdeleted(),Constants.ZERO)
- ||Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
+ && Constants.equalsInteger(discount.getStatus(),Constants.ZERO))){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅宸蹭笅鏋讹紝鏃犳硶杩涜璐拱锛岃鍒锋柊鏌ョ湅");
}
if(!(discount.getStartDate().getTime() < System.currentTimeMillis()
@@ -1264,7 +1247,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"濂楅寮�鏀炬椂闂存湭鍒�,鏃犳硶杩涜璐拱");
}
//楠岃瘉鏄惁瓒呰繃浠婃棩鍙敭鍗栨暟閲�
- if(Objects.nonNull(discount.getSaleDayLimit())){
+ if(Objects.nonNull(discount.getSaleDayLimit())&&discount.getSaleDayLimit()>Constants.ZERO){
if(goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda()
.eq(Goodsorder::getType,Constants.ONE)
.eq(Goodsorder::getObjId,discount.getId())
@@ -1274,13 +1257,12 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅浠婃棩鍙戣閲忓凡鍞絼锛岃鏄庢棩鏌ョ湅锛�");
}
}
- if(Objects.nonNull(discount.getSaleLimit())){
+ if(Objects.nonNull(discount.getSaleLimit())&&discount.getSaleLimit()>Constants.ZERO){
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()){
+ )>=discount.getSaleLimit()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"濂楅鍙戣閲忓凡鍞絼锛�");
}
}
@@ -1289,8 +1271,8 @@
private Object getWxPayResponse(Goodsorder goodsorder,String openid){
+ Object response = null;
//璋冭捣鏀粯
- Object response = null;
PrepayRequest request = new PrepayRequest();
request.setAttach("createGoodsOrder");
request.setDescription(Constants.equalsInteger(goodsorder.getType(),Constants.ZERO)?"妫灄鍏洯鑷杞﹂獞琛屾娂閲戞敮浠�":"妫灄鍏洯鑷杞﹁喘涔伴獞琛屽椁愭敮浠�");
@@ -1417,6 +1399,7 @@
Goodsorder goodsorder = this.goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>()
.eq("member_id",memberId)
.eq("status",Constants.goodsorderStatus.pay)
+ .eq("type",Constants.ZERO)
.last(" limit 1 "));
if(Objects.isNull(goodsorder)){
throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�");
@@ -1562,7 +1545,11 @@
* 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
* @param memberId
*/
- public DiscountMember getUseDiscount(String memberId,Integer driveTime){
+ @Override
+ public DiscountMember getUseDiscount(String memberId,Integer driveTime,Integer type){
+ if(Objects.isNull(type)){
+ return null;
+ }
String today = DateUtil.getToday();
//鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
Holidays holidays = new Holidays();
@@ -1572,13 +1559,17 @@
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")))
+ .apply(" t.use_start_date <= '"+today+"' and t.use_end_date >= '"+today+"' ")
+
+ .eq(Constants.equalsInteger(holiday,Constants.ZERO),DiscountMember::getUseWorkday,Constants.ONE)
.eq(Constants.equalsInteger(holiday,Constants.ONE),DiscountMember::getUseHoliday,Constants.ONE)
+
+ .eq(Constants.equalsInteger(type,Constants.ZERO),DiscountMember::getIsbike,Constants.ONE)
+ .eq(Constants.equalsInteger(type,Constants.ONE),DiscountMember::getIselecbike,Constants.ONE)
.orderByDesc(DiscountMember::getLimitType)
.orderByDesc(DiscountMember::getLimitTime)
);
@@ -1604,22 +1595,23 @@
if(list.size()>Constants.ZERO){
//d1鍦ㄥ墠鍒欏崌搴� 鍙嶄箣闄嶅簭
list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
+ return list.get(Constants.ZERO);
}
- 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()));
+ list.sort((d1,d2)-> Integer.compare(d1.getSurplusTime(),d2.getSurplusTime()));
+ return list.get(Constants.ZERO);
}
- 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()));
+ list.sort((d1,d2)-> Integer.compare(d2.getSurplusTime(),d1.getSurplusTime()));
}
return list.get(Constants.ZERO);
}
@@ -1629,4 +1621,15 @@
}
+
+ @Override
+ 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