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 | 112 +++++++++++++++++++-------------------------------------
1 files changed, 38 insertions(+), 74 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 81955cc..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
@@ -301,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,1)) as refund_date");
+ queryWrapper.select("(select sum(r.money) from refund r where r.obj_id=t.id and r.status in(0,1)) as refund_money");
//鏃堕棿娈电瓫閫�
if (Objects.nonNull(model.getStartDate())){
queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(model.getStartDate()));
@@ -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);
@@ -731,70 +734,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 ) {
//瀛樺偍浜ゆ槗娴佹按琛�
@@ -890,7 +835,6 @@
if(discountMember.getSurplusTime() >= durationSum){
discountLog.setRideTime(durationSum);
discountLog.setRidePrice(closeMoney);
- discountLogMapper.insert(discountLog);
topRides.setActualPrice(BigDecimal.ZERO);
closeMoney = BigDecimal.ZERO;
}else{
@@ -955,13 +899,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 +929,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 +971,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);
@@ -1168,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(),"宸叉敮浠樿繃瀹氶噾锛屾棤娉曢噸澶嶈鎿嶄綔");
}
@@ -1562,6 +1515,7 @@
* 鑾峰彇褰撳墠鍙娇鐢ㄧ殑濂楅
* @param memberId
*/
+ @Override
public DiscountMember getUseDiscount(String memberId,Integer driveTime){
String today = DateUtil.getToday();
//鍒ゆ柇浠婂ぉ鏄惁涓鸿妭鍋囨棩
@@ -1572,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)))
- .le(DiscountMember::getUseEndDate, Utils.Date.getEnd(DateUtil.StringToDate(today)))
+ .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)
@@ -1629,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