From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
index f0138dd..c77a7a0 100644
--- a/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
+++ b/server/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java
@@ -13,6 +13,8 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.PositionUtil;
import com.doumee.core.utils.StringTools;
+import com.doumee.core.wx.SendWxMessage;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.BikesJoinMapper;
@@ -28,6 +30,7 @@
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.PricingRuleService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -77,7 +80,6 @@
@Autowired
private MemberRidesJoinMapper memberRidesJoinMapper;
-
@Autowired
private PricingParamMapper pricingParamMapper;
@@ -86,6 +88,9 @@
@Autowired
private HolidaysMapper holidaysMapper;
+
+ @Autowired
+ private SendWxMessage sendWxMessage;
@Autowired
@@ -96,6 +101,10 @@
return data;
}
+ /**
+ * 鎵嬪姩杩樿溅
+ * @param param
+ */
@Transactional(rollbackFor = {BusinessException.class})
public void backElecBike(BackElecBikeRequest param) {
Member member = memberMapper.selectById(param.getMemberId());
@@ -105,7 +114,24 @@
Goodsorder gparam = new Goodsorder();
gparam.setMemberId(param.getMemberId());
gparam.setStatus(Constants.goodsorderStatus.pay);
+ gparam.setType(Constants.ZERO);
Goodsorder goodsorder = goodsorderService.findOne(gparam);
+ this.backBike(goodsorder);
+ }
+
+ /**
+ * 鑷姩杩樿溅
+ * @param id
+ */
+ @Transactional
+ public void forceBack(String id){
+ Goodsorder goodsorder = goodsorderService.findById(id);
+ this.backBike(goodsorder);
+ }
+
+
+ @Transactional(rollbackFor = {BusinessException.class})
+ public void backBike(Goodsorder goodsorder){
if(Objects.isNull(goodsorder)){
throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"鏃犻獞琛岃鍗曡褰�");
}
@@ -129,7 +155,12 @@
backIds.add(rides.getId());
rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
+
rides.setBackDate(new Date());
+ Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate());
+ //璁＄畻楠戣璁¤垂鏃堕暱
+ rides.setDuration( rideTime > freeRentTime ? rideTime : 0 );
rides.setEditDate(rides.getBackDate());
memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
}
@@ -182,7 +213,7 @@
APIResult<T0201_0500> data = result.block();
if(!data.isSuccess()){
//濡傛灉寮�閿佸け璐ワ紝鍒欒繑鍥炲紓甯�
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝"+(type ==0?"杞﹁締寮�閿�":"杞﹁締鍏抽攣")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝"+(type ==0?"杞﹁締鍏抽攣":"杞﹁締寮�閿�")+"澶辫触锛岃绋嶅悗閲嶈瘯锛屾垨鑰呰仈绯诲洯鍖虹鐞嗕汉鍛橈紒");
}
}
@@ -231,6 +262,7 @@
Goodsorder gparam = new Goodsorder();
gparam.setMemberId(param.getMemberId());
gparam.setStatus(Constants.goodsorderStatus.pay);
+ gparam.setType(Constants.ZERO);
Goodsorder goodsorder = goodsorderService.findOne(gparam);
if(Objects.isNull(goodsorder)){
throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�");
@@ -361,12 +393,13 @@
//濡傛灉杞﹁締绫诲瀷鏄┖
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), " 璇ヨ溅鍨嬫殏鏃朵笉鑳藉�熻溅鎿嶄綔鍝︼紝璇锋洿鎹㈠叾浠栬溅鍨嬮噸璇曪紒");
}
- cacheOpenLock.put(bike.getCode(), 1);
+ cacheOpenLock.put(openElecBikeRequest.getCode(), 1);
try {
//鍒ゆ柇褰撳墠鏄惁宸叉敮浠樻娂閲�
Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
.eq("isdeleted", Constants.ZERO)
.eq("status", Constants.goodsorderStatus.pay)
+ .eq("type", Constants.ZERO)
.eq("member_id", member.getId())
.orderByDesc("create_date")
.last("limit 1"));
@@ -400,17 +433,19 @@
memberRides.setOrdreId(goodsorder.getId());
memberRides.setBikeCode(bike.getCode());
memberRides.setRentDate(new Date());
- memberRides.setType(Constants.ZERO);
+ memberRides.setType(Constants.ONE);
memberRides.setBalance(new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.RENT_DEPOSIT).getCode()));
memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey());
memberRides.setCloseStatus(Constants.ZERO);
memberRidesJoinMapper.insert(memberRides);
BeanUtils.copyProperties(memberRides, memberRidesDetailResponse);
return memberRidesDetailResponse;
- }catch (Exception e){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寮�閿佸け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }catch (BusinessException biz){
+ throw biz;
+ }catch (Exception biz){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR);
}finally {
- cacheOpenLock.remove(bike.getCode());
+ cacheOpenLock.remove(openElecBikeRequest.getCode());
}
}
@@ -424,6 +459,7 @@
Goodsorder gparam = new Goodsorder();
gparam.setMemberId(param.getMemberId());
gparam.setStatus(Constants.goodsorderStatus.pay);
+ gparam.setType(Constants.ZERO);
Goodsorder goodsorder = goodsorderService.findOne(gparam);
if(Objects.isNull(goodsorder)){
throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓鍗曡褰�");
@@ -515,7 +551,7 @@
/**
* 涓存椂鍋滆溅瓒呮椂 鑷姩杩樿溅
*/
- public void autoBackBike(){
+ public void autoBackBike() throws WxErrorException {
List<MemberRides> memberRidesList = memberRidesJoinMapper.selectJoinList(MemberRides.class,new MPJLambdaWrapper<MemberRides>()
.selectAll(MemberRides.class)
.leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
@@ -523,9 +559,10 @@
.eq(MemberRides::getIsdeleted,Constants.ZERO)
.eq(MemberRides::getType,Constants.ONE)
.eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
- .apply(" NOW() >= t.create_date + INTERVAL '2 hours' ")
+ .apply(" NOW() >= (t.create_date + INTERVAL '"+systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PAUSE_AUTO_CLOSE_TIME).getCode()+" min') ")
);
+ ;
for (MemberRides timeOutRides:memberRidesList) {
Goodsorder goodsorder = goodsorderService.findById(timeOutRides.getOrdreId());
//鏌ヨ楠戣璁板綍
@@ -544,6 +581,10 @@
rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
rides.setBackDate(new Date());
+ Integer freeRentTime = Integer.valueOf(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME, Constants.FREE_RENT_TIME).getCode());
+ Integer rideTime = DateUtil.betweenMin(rides.getRentDate(), rides.getBackDate());
+ //璁＄畻楠戣璁¤垂鏃堕暱
+ rides.setDuration( rideTime > freeRentTime ? rideTime : 0 );
rides.setEditDate(rides.getBackDate());
memberRidesJoinMapper.updateById(rides);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
}
@@ -554,6 +595,13 @@
goodsorder.setEditDate(date);
goodsorder.setEditor(null);
goodsorderService.dealCloseGoodsorderBiz( goodsorder,Constants.REFUND_TYPE.NORMAL.getKey(),memberRides);
+ //鍙戦�佸皬绋嬪簭閫氱煡
+ Member member = memberMapper.selectById(goodsorder.getMemberId());
+ if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenid())){
+ sendWxMessage.bookingsCancel(member.getOpenid(),goodsorder.getId(),
+ WxMiniConfig.wxMaService.getAccessToken(),
+ timeOutRides.getBikeCode(),goodsorder.getPayDate(),goodsorder.getEditDate());
+ }
}
}
--
Gitblit v1.9.3