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/web/src/main/java/com/doumee/jtt808/web/service/Jtt808Service.java |   79 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 20 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 ad6648b..ecf63d4 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
@@ -8,12 +8,16 @@
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.Constants;
 import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.dingding.DingDingNotice;
 import com.doumee.core.exception.BusinessException;
 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;
 import com.doumee.dao.business.join.GoodsorderJoinMapper;
 import com.doumee.dao.business.join.MemberRidesJoinMapper;
 import com.doumee.dao.business.join.RefundJoinMapper;
@@ -26,9 +30,11 @@
 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;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ConcurrentReferenceHashMap;
@@ -50,12 +56,18 @@
 
 @Service
 public class Jtt808Service {
+    @Value("${tencent.map.remoteHost}")
+    private String mapHost;
+    @Value("${tencent.map.appKey}")
+    private String mapKey;
     @Autowired
     private MessageManager messageManager;
     @Autowired
     private GoodsorderService goodsorderService;
     @Autowired
     private BikesMapper bikesMapper;
+    @Autowired
+    private BikesJoinMapper bikesJoinMapper;
 
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
@@ -78,6 +90,9 @@
     @Autowired
     private HolidaysMapper holidaysMapper;
 
+    @Autowired
+    private SendWxMessage sendWxMessage;
+
 
     @Autowired
     PricingRuleService pricingRuleService;
@@ -96,6 +111,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(),"鏃犻獞琛岃鍗曡褰�");
@@ -111,16 +127,21 @@
                 if(Constants.equalsInteger(rides.getStatus(),Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey())
                         &&Constants.equalsInteger(rides.getType(),Constants.ONE)){
                     //濡傛灉鏄數杞﹀苟涓旀槸楠戣涓� 杩涜鍏抽攣澶勭悊
-                    Bikes  bike = getElecBikeByCode(rides.getBikeCode());
-                    //鏌ヨ鍋滆溅绔欑偣淇℃伅
-                    if(bike.getSiteId() ==null){
-                        throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒");
-                    }
-                    lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰
+//                    Bikes  bike = getElecBikeByCode(rides.getBikeCode());
+//                    //鏌ヨ鍋滆溅绔欑偣淇℃伅
+//                    if(bike.getSiteId() ==null){
+//                        throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇锋寜瑕佹眰鍓嶅線鍋滆溅鐐瑰仠杞︼紒");
+//                    }
+//                    lockBikes(bike.getDeviceSn(),Constants.ZERO);//鍙戣捣鍏抽攣鎸囦护璇锋眰
                     backIds.add(rides.getId());
                     rides.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());//宸茶繕杞�
-                    rides.setBackSiteId(bike.getSiteId());//杩樿溅绔欑偣
+//                    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);//鏇存柊楠戣鐘舵�佷负宸茶繕杞�
                 }
@@ -235,9 +256,9 @@
         if(memberRides ==null || memberRides.getBikeCode() == null){
             throw new BusinessException(ResponseStatus.NO_UNCLOSEED_ORDER.getCode(),"瀵逛笉璧凤紝鏈煡璇㈠埌鎮ㄥ綋鍓嶆湁楠戣涓褰�");
         }
-        Bikes bike = getElecBikeByCode(memberRides.getBikeCode());
-        //鏌ヨ鍋滆溅浣嶇疆鏄惁绗﹀悎鍋滆溅浣嶇疆瑙勮寖
-        checkPausePostionBiz(bike);
+//        Bikes bike = getElecBikeByCode(memberRides.getBikeCode());
+//        //鏌ヨ鍋滆溅浣嶇疆鏄惁绗﹀悎鍋滆溅浣嶇疆瑙勮寖
+//        checkPausePostionBiz(bike);
         memberRides.setPauseDate(new Date());
         memberRides.setEditDate(memberRides.getBackDate());
         memberRides.setStatus(Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey());
@@ -274,8 +295,12 @@
         }
     }
 
-    public void updateBikesInfo(List<T0200> list) {
+    public void updateBikesInfo(List<T0200> list) throws Exception{
         Date date = new Date();
+        BigDecimal lowVoltage = new BigDecimal(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.LOW_VOLTAGE).getCode());
+        String ddToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_TOKEN).getCode();
+        String ddRobotCode = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_ROBOTCODE).getCode();
+        String ddChatToken = systemDictDataBiz.queryByCode(Constants.DINGDING,Constants.DINGDING_CHATTOKEN).getCode();
         for(T0200 m : list){
             Bikes bike = new Bikes();
             bike.setDeviceSn(m.getClientId());
@@ -316,6 +341,17 @@
                     .set(Bikes::getSiteId,site ==null?null:site.getId())
                     .set( Bikes::getHeartDate,date)
                     .eq(Bikes::getId,bikes.getId()));
+
+            if(bikes.getVoltage().compareTo(lowVoltage)>=Constants.ZERO
+                    && bike.getVoltage().compareTo(lowVoltage)<Constants.ZERO){
+                //鍙戦�侀拤閽夐�氱煡
+                DingDingNotice.lowVoltageNotice(bikes.getCode(),
+                        PositionUtil.getTxMapAddrByLatAndLng(Double.valueOf(bike.getLatitude().toString()),Double.valueOf(bike.getLongitude().toString()),mapHost,mapKey)
+                        ,Objects.nonNull(site)?site.getName():null,
+                        ddToken,
+                        ddRobotCode,
+                        ddChatToken);
+            }
         }
     }
 
@@ -343,6 +379,7 @@
             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"));
@@ -367,7 +404,7 @@
             //鏍规嵁杞﹀瀷鏌ヨ璁′环鏂规
             isValidePricingType(bike,memberRides) ;
             MemberRidesDetailResponse memberRidesDetailResponse = new MemberRidesDetailResponse();
-            this.lockBikes(bike.getDeviceSn(),1);
+//            this.lockBikes(bike.getDeviceSn(),1);
             //瀛樺偍楠戣璁板綍
             memberRides.setId(Constants.getUUID());
             memberRides.setIsdeleted(Constants.ZERO);
@@ -376,7 +413,7 @@
             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);
@@ -491,14 +528,14 @@
     /**
      * 涓存椂鍋滆溅瓒呮椂 鑷姩杩樿溅
      */
-    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)
                 .eq(Goodsorder::getStatus,Constants.ONE)
                 .eq(MemberRides::getIsdeleted,Constants.ZERO)
                 .eq(MemberRides::getType,Constants.ONE)
-                .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING)
+                .eq(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_PAUSING.getKey())
                 .apply(" NOW() >= t.create_date  + INTERVAL '2 hours' ")
         );
 
@@ -530,12 +567,14 @@
             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.getEndDate());
+            }
+
+
         }
-
-
-
-
-
     }
 
 

--
Gitblit v1.9.3