update 预约充电记录

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMemberRelationMapper.java

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
 
 import java.util.List;
 import com.jsowell.pile.domain.PileMemberRelation;
+import com.jsowell.pile.vo.uniapp.customer.MemberVO;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -71,4 +72,6 @@ public interface PileMemberRelationMapper
 
 
     int deleteRelationByIds(List<Integer> ids);
+
+    List<MemberVO> selectMemberList(String pileSn);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PileMemberRelationService.java

@@ -1,6 +1,7 @@
 package com.jsowell.pile.service;
 
 import com.jsowell.pile.domain.PileMemberRelation;
+import com.jsowell.pile.vo.uniapp.customer.MemberVO;
 
 import java.util.List;
 
@@ -78,4 +79,5 @@ public interface PileMemberRelationService
      */
 	List<PileMemberRelation> selectPileMemberRelationByPileSn(String pileSn);
 
+    List<MemberVO> selectMemberList(String pileSn);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java

@@ -34,6 +34,8 @@ public interface PileReservationInfoService {
 
     List<PileReservationInfo> getReservationsByMemberIdAndPileSn(String memberId, String pileSn);
 
+    PileReservationInfo selectByPileConnectorCode(String pileConnectorCode);
+
     /**
      * 启动预约
      * @param dto

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -14,10 +14,7 @@ import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.*;
-import com.jsowell.pile.domain.PileBasicInfo;
-import com.jsowell.pile.domain.PileConnectorInfo;
-import com.jsowell.pile.domain.PileModelInfo;
-import com.jsowell.pile.domain.PileSimInfo;
+import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.mapper.PileBasicInfoMapper;
 import com.jsowell.pile.service.*;
@@ -28,9 +25,11 @@ import com.jsowell.pile.thirdparty.EquipmentInfo;
 import com.jsowell.pile.thirdparty.ZDLConnectorInfo;
 import com.jsowell.pile.thirdparty.ZDLEquipmentInfo;
 import com.jsowell.pile.util.UserUtils;
+import com.jsowell.pile.vo.PileReservationInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO;
+import com.jsowell.pile.vo.uniapp.customer.MemberVO;
 import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO;
 import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO;
 import com.jsowell.pile.vo.web.*;
@@ -44,6 +43,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.sql.Time;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -93,6 +94,9 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 	@Autowired
 	private OrderBasicInfoService orderBasicInfoService;
 
+	@Autowired
+	private PileMemberRelationService pileMemberRelationService;
+
 	/**
 	 * 查询设备管理
 	 *
@@ -1226,7 +1230,20 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 		// 创建订单
 		orderBasicInfoService.createReservationOrder(chargingStartupResult);
 
-		// 小程序通知
-		wxAppletRemoteService.reservationStartupResultSendMsg(chargingStartupResult);
+		// 查预约信息
+		String pileConnectorCode = chargingStartupResult.getPileSn() + chargingStartupResult.getConnectorCode();
+		PileReservationInfo pileReservationInfo = pileReservationInfoService.selectByPileConnectorCode(pileConnectorCode);
+
+		LocalDateTime[] localDateTimes = DateUtils.convertStartAndEndTime(pileReservationInfo.getStartTime().toString(), pileReservationInfo.getEndTime().toString());
+		// 发小程序通知消息
+		String startTime = DateUtils.formatDateTime(localDateTimes[0]);
+		String endTime = DateUtils.formatDateTime(localDateTimes[1]);
+		String startUpResult = chargingStartupResult.getStartupResult();
+		String failReason = chargingStartupResult.getFailReason();
+		// 根据pileSn 查询使用者列表
+		List<MemberVO> memberVOS = pileMemberRelationService.selectMemberList(chargingStartupResult.getPileSn());
+		for (MemberVO memberVO : memberVOS) {
+			wxAppletRemoteService.reservationStartupResultSendMsg(memberVO.getOpenId(), startTime, endTime, startUpResult, failReason);
+		}
 	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMemberRelationServiceImpl.java

@@ -7,6 +7,7 @@ import com.jsowell.pile.domain.PileMemberRelation;
 import com.jsowell.pile.mapper.PileMemberRelationMapper;
 import com.jsowell.pile.service.PileConnectorInfoService;
 import com.jsowell.pile.service.PileMemberRelationService;
+import com.jsowell.pile.vo.uniapp.customer.MemberVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -118,4 +119,8 @@ public class PileMemberRelationServiceImpl implements PileMemberRelationService
 		return selectPileMemberRelationList(pileMemberRelation);
 	}
 
+	public List<MemberVO> selectMemberList(String pileSn) {
+		return pileMemberRelationMapper.selectMemberList(pileSn);
+	}
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java

@@ -28,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.sql.Date;
 import java.sql.Time;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -127,6 +126,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
         return pileReservationInfoMapper.findByMemberIdAndPileSn(memberId, pileSn);
     }
 
+    @Override
     public PileReservationInfo selectByPileConnectorCode(String pileConnectorCode) {
         return pileReservationInfoMapper.selectByPileConnectorCode(pileConnectorCode);
     }

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberVO.java

@@ -25,6 +25,11 @@ public class MemberVO {
      */
     private String memberId;
 
+    /**
+     * 微信openId
+     */
+    private String openId;
+
     /**
      * 会员所属一级运营商
      */