Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts: # jsowell-admin/src/test/java/SpringBootTestController.java # jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
2026-04-20 19:15:35 +08:00 · 2024-06-20 14:23:08 +08:00
parent 9aea88ab4a af96ae4a1c
commit e409427db3
21 changed files with 1061 additions and 341 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
@@ -1,6 +1,7 @@
 package com.jsowell.api.uniapp;

 import com.alibaba.fastjson2.JSON;
+import com.google.common.collect.ImmutableMap;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.page.PageResponse;
@@ -8,10 +9,13 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.dto.CreateReservedDTO;
+import com.jsowell.pile.dto.PileReservedDTO;
 import com.jsowell.pile.dto.PileMemberBindingDTO;
 import com.jsowell.pile.dto.QueryPersonPileDTO;
 import com.jsowell.pile.service.PileBasicInfoService;
 import com.jsowell.pile.service.PileMerchantInfoService;
+import com.jsowell.pile.vo.PileReservedVO;
 import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
 import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO;
 import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
@@ -251,24 +255,76 @@ public class PersonPileController extends BaseController {
     */

    /**
-     * 取消预约
+     * 添加预约充电
+     * http://localhost:8080/uniapp/personalPile/createReserved
     */
-    public RestApiResponse<?> canal(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
-        logger.info("取消预约params:{}", JSON.toJSONString(dto));
+    @PostMapping("/createReserved")
+    public RestApiResponse<?> createReserved(HttpServletRequest request, @RequestBody CreateReservedDTO dto) {
+        // logger.info("修改预约充电状态params:{}", dto);
        RestApiResponse<?> response = null;
        try {
            String memberId = getMemberIdByAuthorization(request);
            dto.setMemberId(memberId);
-            pileService.canalReserved(dto);
-            response = new RestApiResponse<>();
+            int reservedId = pileService.createReserved(dto);
+            response = new RestApiResponse<>(ImmutableMap.of("reservedId", reservedId));
        } catch (BusinessException e) {
-            logger.error("取消预约error", e);
+            logger.error("添加预约充电error, params:{}", dto, e);
            response = new RestApiResponse<>(e.getCode(), e.getMessage());
        } catch (Exception e) {
-            logger.error("取消预约error", e);
-            response = new RestApiResponse<>(e);
+            logger.error("添加预约充电error, params:{}", dto, e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_CREATE_RESERVED_ERROR);
        }
-        logger.info("取消预约result:{}", response);
+        logger.info("添加预约充电params:{}, result:{}", dto, response);
        return response;
    }
+
+    /**
+     * 查询预约充电列表
+     * http://localhost:8080/uniapp/personalPile/queryReservedList
+     */
+    @PostMapping("/queryReservedList")
+    public RestApiResponse<?> queryReservedList(HttpServletRequest request, @RequestBody PileReservedDTO dto) {
+        // logger.info("修改预约充电状态params:{}", dto);
+        RestApiResponse<?> response = null;
+        try {
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            PageResponse pageResponse = pileService.queryReservedList(dto);
+            response = new RestApiResponse<>(pageResponse);
+        } catch (BusinessException e) {
+            logger.error("查询预约列表error, params:{}", dto, e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("查询预约列表error, params:{}", dto, e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_QUERY_RESERVED_LIST_ERROR);
+        }
+        logger.info("查询预约列表params:{}, result:{}", dto, response);
+        return response;
+    }
+
+    /**
+     * 修改预约充电状态
+     * http://localhost:8080/uniapp/personalPile/updateReservedStatus
+     */
+    @PostMapping("/updateReservedStatus")
+    public RestApiResponse<?> updateReservedStatus(HttpServletRequest request, @RequestBody PileReservedDTO dto) {
+        // logger.info("修改预约充电状态params:{}", dto);
+        RestApiResponse<?> response = null;
+        try {
+            String memberId = getMemberIdByAuthorization(request);
+            dto.setMemberId(memberId);
+            pileService.updateReservedStatus(dto);
+            response = new RestApiResponse<>();
+        } catch (BusinessException e) {
+            logger.error("修改预约充电状态error, params:{}", dto, e);
+            response = new RestApiResponse<>(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            logger.error("修改预约充电状态error, params:{}", dto, e);
+            response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
+        }
+        logger.info("修改预约充电状态params:{}, result:{}", dto, response);
+        return response;
+    }
+
+
 }
--- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java
@@ -16,21 +16,13 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.SecurityUtils;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.domain.*;
+import com.jsowell.pile.dto.*;
 import com.jsowell.pile.util.SnUtils;
 import com.jsowell.pile.service.*;
-import com.jsowell.pile.domain.MemberBasicInfo;
-import com.jsowell.pile.domain.OrderBasicInfo;
-import com.jsowell.pile.domain.PileBasicInfo;
-import com.jsowell.pile.domain.PileConnectorInfo;
-import com.jsowell.pile.domain.PileMemberRelation;
-import com.jsowell.pile.domain.PileStationInfo;
-import com.jsowell.pile.dto.BatchCreatePileDTO;
-import com.jsowell.pile.dto.MemberRegisterAndLoginDTO;
-import com.jsowell.pile.dto.PileMemberBindingDTO;
-import com.jsowell.pile.dto.QueryPersonPileDTO;
-import com.jsowell.pile.dto.QueryStationDTO;
 import com.jsowell.pile.transaction.dto.PileTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
+import com.jsowell.pile.vo.PileReservedVO;
 import com.jsowell.pile.vo.base.ConnectorInfoVO;
 import com.jsowell.pile.vo.base.MerchantInfoVO;
 import com.jsowell.pile.vo.base.PileInfoVO;
@@ -50,6 +42,7 @@ import org.springframework.stereotype.Service;

 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -95,6 +88,9 @@ public class PileService {
 	@Autowired
 	private PileRemoteService pileRemoteService;

+	@Autowired
+	private PileReservedInfoService pileReservedInfoService;
+
 	/**
 	 * 查询设备信息
 	 *
@@ -562,10 +558,68 @@ public class PileService {


 	/**
-	 * 取消预约充电
+	 * 修改预约充电状态
 	 * @param dto
 	 */
-	public void canalReserved(QueryPersonPileDTO dto) {
+	public void updateReservedStatus(PileReservedDTO dto) {
+		if (StringUtils.equals(dto.getStatus(), Constants.ZERO)) {
+			// 停用
+			pileReservedInfoService.deactivateReserved(dto);
+		} else if (StringUtils.equals(dto.getStatus(), Constants.ONE)) {
+			// 启用
+			pileReservedInfoService.activateReserved(dto);
+		}
+	}

+	public int createReserved(CreateReservedDTO dto) {
+		PileReservedInfo reservedInfo = new PileReservedInfo();
+		reservedInfo.setMemberId(dto.getMemberId());
+		reservedInfo.setPileSn(dto.getPileSn());
+		reservedInfo.setPileConnectorCode(dto.getPileConnectorCode());
+		reservedInfo.setStatus(Constants.ZERO); // 默认未生效
+		// reservedInfo.setStartTime(DateUtils.parseDate(dto.getStartTime()));
+		reservedInfo.setStartTime(Time.valueOf(dto.getStartTime()));
+		// reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime()));
+		reservedInfo.setEndTime(Time.valueOf(dto.getEndTime()));
+		if (StringUtils.isNotBlank(dto.getFreq())) {
+			reservedInfo.setReservedType("recurring");
+			reservedInfo.setFreq(dto.getFreq());
+		} else {
+			reservedInfo.setReservedType("single");
+			reservedInfo.setFreq(null);
+		}
+		reservedInfo.setCreateBy(dto.getMemberId());
+		pileReservedInfoService.insertSelective(reservedInfo);
+		return reservedInfo.getId();
+	}
+
+	public PageResponse queryReservedList(PileReservedDTO dto) {
+		int pageNo = dto.getPageNo() == null ? Constants.one : dto.getPageNo();
+		int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
+		PageHelper.startPage(pageNo, pageSize);
+		List<PileReservedInfo> list = pileReservedInfoService.getReservationsByMemberIdAndPileSn(dto.getMemberId(), dto.getPileSn());
+		PageInfo<PileReservedInfo> pageInfo = new PageInfo<>(list);
+
+		PageResponse pageResponse = new PageResponse();
+		pageResponse.setPageNum(pageInfo.getPageNum());
+		pageResponse.setPageSize(pageInfo.getPageSize());
+		pageResponse.setPages(pageInfo.getPages());
+		pageResponse.setTotal(pageInfo.getTotal());
+
+		List<PileReservedVO> resultList = Lists.newArrayList();
+		for (PileReservedInfo reservedInfo : pageInfo.getList()) {
+			resultList.add(
+					PileReservedVO.builder()
+							.reservedId(reservedInfo.getId() + "")
+							.pileSn(reservedInfo.getPileSn())
+							.startTime(reservedInfo.getStartTime().toString())
+							.endTime(reservedInfo.getEndTime().toString())
+							.freq(reservedInfo.getFreq())
+							.status(reservedInfo.getStatus())
+							.build()
+			);
+		}
+		pageResponse.setList(resultList);
+		return pageResponse;
 	}
 }
--- a/jsowell-admin/src/main/resources/application-prd.yml
+++ b/jsowell-admin/src/main/resources/application-prd.yml
@@ -167,12 +167,14 @@ adapay:
    rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ==
    appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa
    wechatAppId: wxbb3e0d474569481d
+    alipayAppId: 2021004145642756
  xixiao:
    apiKey: api_live_8690aad5-18df-4c94-ba8c-4f9499721c65
    mockApiKey: api_test_a2944395-e6ba-4d59-969a-f629b7a9e53e
    rsaPrivateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJ608yEkr5Fxj3ID9fIzavuwW/orgjlD1SIrmZVTwLFzM+ljnr/iFMRRhjJZZGImO+ySj296N+VPujHiiQZqymgIACdORs3YyRvxOeWQoPKiik21mOiF7RRw2GIOQEzqo0MKeJ/qdK89FvwnAIZKRXl+ccH/VTTr68VGWuiLWEK3AgMBAAECgYACsMCaZDvRtGIhJa4KsBJ1N9UnVYt8mwjG7oRJAsV2fKR5pWWwjQ2bEmK7Acbw3wMPDKD/28uMyKA4bkWyZScPO5T2Mhvo28AVOfdsbBht70iKzBAXuqHhHd99+AEmQL9ZcoCYCvoP2JqV8cHp5sXGEvncm9VRsjs3iSTsBYu0WQJBANB6x0DCPnAFXYnKvtBcBmF4jU8pO0iIGtx/ZR/N0pRTbL7cIvh+z6ZqtWo880Xbcli6i1qwZl1ctWwV0yKArOsCQQDC4dN6e8/Gj3FubXLmyLfIrbq7BuHW8kg19t0/wmAXunpkBtFhAA2FD7FYGg+/l6/f6YqWX8nSUr6pFZQI0Z5lAkARvBANIzj6gIpXeWbIBLwKOJ4UuNYxMlrOnQu2K+UY9wvOJJ3Y87ioWHV8RxkOvT856wyFt3HNyWAphKXETpvnAkEAnIjJ1ktW9FXJtfph3bABt0acg5eelYmcqQP2aT1W9BhMMMYtLi3drjCRsYOVfL55fXBYajrcoHzoOmZjtsWw5QJBAM/Wpk6L7BLVi357icleuivPtKsP04Ix5afUpgiFmssEheiLAxr+Zs5/nk/HM6V4Pk8kA0ILaNbRqjfAF5ZnAvk=
    appId: app_7848ccb2-f7e7-4841-a968-fbf02cc265ad
    wechatAppId: wx20abc5210391649c
+    alipayAppId: wx20abc5210391649c # 待修改为真正的支付宝小程序id

 #高德地图相关配置
 aMap:
--- a/jsowell-admin/src/main/resources/application-pre.yml
+++ b/jsowell-admin/src/main/resources/application-pre.yml
@@ -167,12 +167,14 @@ adapay:
    rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ==
    appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa
    wechatAppId: wxbb3e0d474569481d
+    alipayAppId: 2021004145642756
  xixiao:
    apiKey: api_live_8690aad5-18df-4c94-ba8c-4f9499721c65
    mockApiKey: api_test_a2944395-e6ba-4d59-969a-f629b7a9e53e
    rsaPrivateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJ608yEkr5Fxj3ID9fIzavuwW/orgjlD1SIrmZVTwLFzM+ljnr/iFMRRhjJZZGImO+ySj296N+VPujHiiQZqymgIACdORs3YyRvxOeWQoPKiik21mOiF7RRw2GIOQEzqo0MKeJ/qdK89FvwnAIZKRXl+ccH/VTTr68VGWuiLWEK3AgMBAAECgYACsMCaZDvRtGIhJa4KsBJ1N9UnVYt8mwjG7oRJAsV2fKR5pWWwjQ2bEmK7Acbw3wMPDKD/28uMyKA4bkWyZScPO5T2Mhvo28AVOfdsbBht70iKzBAXuqHhHd99+AEmQL9ZcoCYCvoP2JqV8cHp5sXGEvncm9VRsjs3iSTsBYu0WQJBANB6x0DCPnAFXYnKvtBcBmF4jU8pO0iIGtx/ZR/N0pRTbL7cIvh+z6ZqtWo880Xbcli6i1qwZl1ctWwV0yKArOsCQQDC4dN6e8/Gj3FubXLmyLfIrbq7BuHW8kg19t0/wmAXunpkBtFhAA2FD7FYGg+/l6/f6YqWX8nSUr6pFZQI0Z5lAkARvBANIzj6gIpXeWbIBLwKOJ4UuNYxMlrOnQu2K+UY9wvOJJ3Y87ioWHV8RxkOvT856wyFt3HNyWAphKXETpvnAkEAnIjJ1ktW9FXJtfph3bABt0acg5eelYmcqQP2aT1W9BhMMMYtLi3drjCRsYOVfL55fXBYajrcoHzoOmZjtsWw5QJBAM/Wpk6L7BLVi357icleuivPtKsP04Ix5afUpgiFmssEheiLAxr+Zs5/nk/HM6V4Pk8kA0ILaNbRqjfAF5ZnAvk=
    appId: app_7848ccb2-f7e7-4841-a968-fbf02cc265ad
    wechatAppId: wx20abc5210391649c
+    alipayAppId: wx20abc5210391649c # 待修改为真正的支付宝小程序id

 #高德地图相关配置
 aMap:
--- a/jsowell-admin/src/main/resources/application-sit.yml
+++ b/jsowell-admin/src/main/resources/application-sit.yml
@@ -170,12 +170,14 @@ adapay:
    rsaPrivateKey: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOl7qJyrkrks7FKnBPr/Sngub897Ni5Bkn5pEa81zfs+4LrYsuWZQ8G1n7Q8/rjH4G/T7vPX+So41vNU74Sqn6E1b3BpW+wWBULhs9p1JSPT7Kzima4FmPigUr80NLrlVKn5bW+V4/odpN+bJWvpxdd024edHAD8mXX1M1N1lU5ZAgMBAAECgYA+mxbiM6tbFe2kV/6g4vVv9luq0cn8az7BwKCqT44U8Y5G67ZElG0zsuTI6pYOrCHFOpnXLrE0HhudEchL1YiJqW/SDKaoC4oDZf5nybhh11kOR3N5maLqvUz/WxdNy17th/2XxqVfTTu752X9yeeoXDj89N5OxyMl0jmxlhWbgQJBAPeoitR7FCxcjKtcKsEyrtV3T0H2WtQ2Pbku7CGe6VCtL4+DJNeUentn7plBj4IhbH3EwNmyCYzNlfp0X2d8fWkCQQDxWONjt1vV/dyKQYRvSVw/SWQWlR7g2OnHZokU2SNeewiCX2umCdYKh0doN0JHbSTLOGG5IA3+6Vxam+9hzPtxAkEAjr+QHf8/Vn6V+mOqpSdgjNwzS/MC0ZTeKPI52vsswnrAkjjmMHh9zMnQRnf6juhTD38sJY6wYH9TdkRDhXPFGQJATiFYe4+AS2ZDXv6WwPAezN4VaLodpOyTwdmPxxAEQzHRL2N0levZPs9MbpB1BGpw3tkBycx2u28QVsTkWeTiAQJAGRsAVr6Rhhdaq2vTjt9orhMVwt6BCoSQ0zzHSYilv4PMOtSu1Pyt4K8BDv3gjEyAi1GtE7kkJ0dcbsvOGiLzqQ==
    appId: app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa
    wechatAppId: wxbb3e0d474569481d
+    alipayAppId: 2021004145642756
  xixiao:
    apiKey: api_live_8690aad5-18df-4c94-ba8c-4f9499721c65
    mockApiKey: api_test_a2944395-e6ba-4d59-969a-f629b7a9e53e
    rsaPrivateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJ608yEkr5Fxj3ID9fIzavuwW/orgjlD1SIrmZVTwLFzM+ljnr/iFMRRhjJZZGImO+ySj296N+VPujHiiQZqymgIACdORs3YyRvxOeWQoPKiik21mOiF7RRw2GIOQEzqo0MKeJ/qdK89FvwnAIZKRXl+ccH/VTTr68VGWuiLWEK3AgMBAAECgYACsMCaZDvRtGIhJa4KsBJ1N9UnVYt8mwjG7oRJAsV2fKR5pWWwjQ2bEmK7Acbw3wMPDKD/28uMyKA4bkWyZScPO5T2Mhvo28AVOfdsbBht70iKzBAXuqHhHd99+AEmQL9ZcoCYCvoP2JqV8cHp5sXGEvncm9VRsjs3iSTsBYu0WQJBANB6x0DCPnAFXYnKvtBcBmF4jU8pO0iIGtx/ZR/N0pRTbL7cIvh+z6ZqtWo880Xbcli6i1qwZl1ctWwV0yKArOsCQQDC4dN6e8/Gj3FubXLmyLfIrbq7BuHW8kg19t0/wmAXunpkBtFhAA2FD7FYGg+/l6/f6YqWX8nSUr6pFZQI0Z5lAkARvBANIzj6gIpXeWbIBLwKOJ4UuNYxMlrOnQu2K+UY9wvOJJ3Y87ioWHV8RxkOvT856wyFt3HNyWAphKXETpvnAkEAnIjJ1ktW9FXJtfph3bABt0acg5eelYmcqQP2aT1W9BhMMMYtLi3drjCRsYOVfL55fXBYajrcoHzoOmZjtsWw5QJBAM/Wpk6L7BLVi357icleuivPtKsP04Ix5afUpgiFmssEheiLAxr+Zs5/nk/HM6V4Pk8kA0ILaNbRqjfAF5ZnAvk=
    appId: app_7848ccb2-f7e7-4841-a968-fbf02cc265ad
    wechatAppId: wx20abc5210391649c
+    alipayAppId: wx20abc5210391649c # 待修改为真正的支付宝小程序id


 #高德地图相关配置
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -262,6 +262,16 @@ public class SpringBootTestController {
    @Autowired
    private NotificationService notificationService;

+    @Test
+    public void queryPaymentReverseTest2() {
+        String paymentId = "002212024061717243610648707836701741056";
+        try {
+            adapayService.queryPaymentReverse(paymentId, wechatAppId1);
+        } catch (BaseAdaPayException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
    @Test
    public void createBalancePaymentRequestTest() {
        String outMemberId = "ACM40782726";
@@ -895,6 +905,8 @@ public class SpringBootTestController {
        String jsonArrayString = "[" +
                "{\"orderCode\":\"C44529020684\", \"settleAmount\":\"15.67\", \"paymentId\":\"002212024050317243010632400358265659392\"}" +
                "{\"orderCode\":\"C63381134165\", \"settleAmount\":\"39.65\", \"paymentId\":\"002212024052518295510640389353916465152\"}" +
+                "{\"orderCode\":\"C44778282947\", \"settleAmount\":\"8.38\", \"paymentId\":\"002212023101608315910559788773415297024\"}" +
+                "{\"orderCode\":\"C44778282947\", \"settleAmount\":\"8.38\", \"paymentId\":\"002212023101608315910559788773415297024\"}" +
                "]";
        return JSONArray.parseArray(jsonArrayString);
    }
@@ -930,8 +942,8 @@ public class SpringBootTestController {
    public void queryCreateConfirmReverse() throws BaseAdaPayException {
        List<String> paymentIdList = getPaymentIdList(); // 查询分账信息

-        List<String> unSplitList = Lists.newArrayList(); //
-        List<String> splitList = Lists.newArrayList(); //
+        List<String> unSplitList = Lists.newArrayList(); // 未分帐
+        List<String> splitList = Lists.newArrayList(); // 已分帐

        BigDecimal total = BigDecimal.ZERO;
        List<String> selfList = Lists.newArrayList();
@@ -1734,6 +1746,255 @@ public class SpringBootTestController {
        list.add("002212024053119492410642583680556568576");
        list.add("002212024053120084110642588534245376000");
        list.add("002212024053120090610642588641829273600");
+        list.add("002212024013008060410598195363803480064");
+        list.add("002212024013008130010598197109908156416");
+        list.add("002212024013019392410598369846177918976");
+        list.add("002212024013108410410598566558256963584");
+        list.add("002212024013108505610598569040739135488");
+        list.add("002212024013110011810598586751293992960");
+        list.add("002212024013112032710598617491298971648");
+        list.add("002212024020108052910598919992595804160");
+        list.add("002212024020108304410598926348483653632");
+        list.add("002212024020108363910598927835231076352");
+        list.add("002212024020111390410598973743414730752");
+        list.add("002212024020114322110599017350088626176");
+        list.add("002212024020114474410599021222320615424");
+        list.add("002212024020115092510599026678041018368");
+        list.add("002212024020119590210599099564427669504");
+        list.add("002212024020207054910599267366398578688");
+        list.add("002212024020208262510599287646486110208");
+        list.add("002212024020214265010599378351836442624");
+        list.add("002212024020215343210599395386694881280");
+        list.add("002212024020307373210599637734226214912");
+        list.add("002212024020316072110599766035400572928");
+        list.add("002212024020322230010599860568206397440");
+        list.add("002212024020408093410600008184035123200");
+        list.add("002212024020409244810600027116138618880");
+        list.add("002212024020508184010600372861536260096");
+        list.add("002212024020514283510600465955553648640");
+        list.add("002212024020517003910600504221174415360");
+        list.add("002212024020521230310600570256004050944");
+        list.add("002212024020608155210600734545404710912");
+        list.add("002212024020608382510600740220346396672");
+        list.add("002212024020608451110600741920730718208");
+        list.add("002212024020609124110600748841333379072");
+        list.add("002212024020614411210600831517739819008");
+        list.add("002212024020708312310601100837498085376");
+        list.add("002212024020714333610601191990266511360");
+        list.add("002212024020808475610601467388114333696");
+        list.add("002212024020810053710601486939065114624");
+        list.add("002212024020811101310601503195798601728");
+        list.add("002212024020813113610601533745412943872");
+        list.add("002212024020908390010601827531082936320");
+        list.add("002212024020910022910601848539790401536");
+        list.add("002212024020910361810601857048976125952");
+        list.add("002212024020914165310601912561811931136");
+        list.add("002212024020914461510601919951398666240");
+        list.add("002212024020918534910601982251957444608");
+        list.add("002212024021120334410602732175872696320");
+        list.add("002212024021122380810602763479644069888");
+        list.add("002212024021214122510602998599363010560");
+        list.add("002212024021315415910603383530189070336");
+        list.add("002212024021400083110603511002905235456");
+        list.add("002212024021416051710603751779179274240");
+        list.add("002212024021423023410603856791162929152");
+        list.add("002212024021511412210604047750442496000");
+        list.add("002212024021514072810604084516702027776");
+        list.add("002212024021515430710604108588191272960");
+        list.add("002212024021523001310604218587504525312");
+        list.add("002212024021608381110604364039677882368");
+        list.add("002212024021623020310604581439817023488");
+        list.add("002212024021722362610604937380427948032");
+        list.add("002212024021808001010605079249543716864");
+        list.add("002212024021808104810605081925655490560");
+        list.add("002212024021808185910605083981192704000");
+        list.add("002212024021810383210605119103427313664");
+        list.add("002212024021908582810605456306802053120");
+        list.add("002212024022109131310606184796175687680");
+        list.add("002212024022119525210606345768395419648");
+        list.add("002212024022218212410606685138835025920");
+        list.add("002212024022307485310606888346055372800");
+        list.add("002212024022308550410606905004268617728");
+        list.add("002212024022408553910607267536671035392");
+        list.add("002212024022517022910607752442171338752");
+        list.add("002212024022521075910607814222629285888");
+        list.add("002212024022609245810607999689369276416");
+        list.add("002212024022708185910608345472558899200");
+        list.add("002212024022808171110608707409136111616");
+        list.add("002212024022808415410608713630598144000");
+        list.add("002212024022908220310609071021906227200");
+        list.add("002212024022908291710609072841400475648");
+        list.add("002212024022908495410609078031603834880");
+        list.add("002212024022908535210609079026622164992");
+        list.add("002212024022920294410609254148826947584");
+        list.add("002212024030108013710609428267015561216");
+        list.add("002212024030108192710609432753644294144");
+        list.add("002212024030109255810609449496542498816");
+        list.add("002212024030110432610609468990032666624");
+        list.add("002212024030114414110609528945117454336");
+        list.add("002212024030200361910609678590595244032");
+        list.add("002212024030300003710610031994312007680");
+        list.add("002212024030408224710610520757550407680");
+        list.add("002212024030408314410610523009898565632");
+        list.add("002212024030422585110610741225040171008");
+        list.add("002212024030508104110610880098894979072");
+        list.add("002212024030508365710610886712358817792");
+        list.add("002212024030508490010610889744259559424");
+        list.add("002212024030521512910611086662637559808");
+        list.add("002212024030608175710611244317067141120");
+        list.add("002212024030708090510611604472871477248");
+        list.add("002212024030708282910611609355581992960");
+        list.add("002212024030708502610611614878784106496");
+        list.add("002212024030709174810611621767196659712");
+        list.add("002212024030719534010611781785478717440");
+        list.add("002212024030807594010611964492124340224");
+        list.add("002212024030822443910612187206556524544");
+        list.add("002212024030906325510612305048975122432");
+        list.add("002212024030907350010612320673259941888");
+        list.add("002212024030915525410612445973697167360");
+        list.add("002212024030916303810612455470245429248");
+        list.add("002212024030921533110612536725873057792");
+        list.add("002212024031017202310612830374738165760");
+        list.add("002212024031020531910612883964449075200");
+        list.add("002212024031023432510612926769309773824");
+        list.add("002212024031108301510613059352027627520");
+        list.add("002212024031109563110613081060800557056");
+        list.add("002212024031114040910613143380055498752");
+        list.add("002212024031208192510613419012528644096");
+        list.add("002212024031208341810613422759090114560");
+        list.add("002212024031208412810613424562076852224");
+        list.add("002212024031308225010613782262091567104");
+        list.add("002212024031308360610613785598963986432");
+        list.add("002212024031308371210613785876779442176");
+        list.add("002212024031308422110613787173562695680");
+        list.add("002212024031408241810614145019098722304");
+        list.add("002212024031508224410614507010081640448");
+        list.add("002212024031508590910614516174918074368");
+        list.add("002212024031509281210614523487750299648");
+        list.add("002212024031510283910614538700956971008");
+        list.add("002212024031515211110614612316401750016");
+        list.add("002212024031520151910614686339450355712");
+        list.add("002212024031609341910614887414428016640");
+        list.add("002212024031718294510615384546949754880");
+        list.add("002212024031808035610615589445707841536");
+        list.add("002212024031808260710615595025820246016");
+        list.add("002212024031815323210615702336330211328");
+        list.add("002212024031815375110615703677041405952");
+        list.add("002212024031911254310616002613799657472");
+        list.add("002212024032008101710616315817846980608");
+        list.add("002212024032011532310616371961915990016");
+        list.add("002212024032108120110616678642146373632");
+        list.add("002212024032108354410616684610730549248");
+        list.add("002212024032108424510616686374340608000");
+        list.add("002212024032114381810616775853463097344");
+        list.add("002212024032208245610617044281046831104");
+        list.add("002212024032208312010617045888861618176");
+        list.add("002212024032208434810617049027454844928");
+        list.add("002212024032323465610617638697148858368");
+        list.add("002212024032402541210617685824652591104");
+        list.add("002212024032508523610618138407486066688");
+        list.add("002212024032520172810618310759024463872");
+        list.add("002212024032608315810618495600729882624");
+        list.add("002212024032608391310618497425932648448");
+        list.add("002212024032608510410618500408262008832");
+        list.add("002212024032708422710618860627711471616");
+        list.add("002212024032714244610618946776453619712");
+        list.add("002212024032808424210619223076450693120");
+        list.add("002212024032814205310619308187015802880");
+        list.add("002212024032907525410619572932763545600");
+        list.add("002212024032908303010619582395874840576");
+        list.add("002212024032908500610619587327303061504");
+        list.add("002212024032911524710619633303216230400");
+        list.add("002212024032923193810619806154641907712");
+        list.add("002212024033016321410620066014643077120");
+        list.add("002212024033016343310620066598362058752");
+        list.add("002212024033020173810620122738665811968");
+        list.add("002212024040108490910620674253468303360");
+        list.add("002212024040109022110620677573939793920");
+        list.add("002212024040208244810621030511414784000");
+        list.add("002212024040308254910621393156197027840");
+        list.add("002212024040308393710621396627855544320");
+        list.add("002212024040308404410621396912069971968");
+        list.add("002212024040309543710621415504291794944");
+        list.add("002212024040311170810621436271049670656");
+        list.add("002212024040323530210621626497573154816");
+        list.add("002212024040402372510621667866323075072");
+        list.add("002212024040408542210621762730175643648");
+        list.add("002212024040415481010621866867580702720");
+        list.add("002212024040512391510622181710707392512");
+        list.add("002212024040516392110622242135366791168");
+        list.add("002212024040614223510622570105679126528");
+        list.add("002212024040623165710622704580477042688");
+        list.add("002212024040809150910623217512072990720");
+        list.add("002212024040811153710623247826547335168");
+        list.add("002212024040908295510623568517415526400");
+        list.add("002212024040908523110623574205092974592");
+        list.add("002212024040911290310623613595104657408");
+        list.add("002212024041009232810623944378227253248");
+        list.add("002212024041107493210624283130019381248");
+        list.add("002212024041108193110624290674609082368");
+        list.add("002212024041208114810624651118629326848");
+        list.add("002212024041208300810624655733583732736");
+        list.add("002212024041209162410624667378518835200");
+        list.add("002212024041210260110624684896674537472");
+        list.add("002212024041214283110624745923243118592");
+        list.add("002212024041420442210625565287085670400");
+        list.add("002212024041507423510625730932126121984");
+        list.add("002212024041508341410625743931251539968");
+        list.add("002212024041521063510625933262427582464");
+        list.add("002212024041609581110626127442457104384");
+        list.add("002212024041707543510626458728699969536");
+        list.add("002212024041708271210626466935588491264");
+        list.add("002212024041708532810626473545384984576");
+        list.add("002212024041808322310626830625628844032");
+        list.add("002212024041808581710626837143647076352");
+        list.add("002212024041810270010626859470992621568");
+        list.add("002212024041810323510626860875480481792");
+        list.add("002212024041816371210626952633348419584");
+        list.add("002212024041820424210627014417214259200");
+        list.add("002212024041908145410627188615932936192");
+        list.add("002212024041908295410627192392017481728");
+        list.add("002212024042012450810627619008926924800");
+        list.add("002212024042012542310627621336262328320");
+        list.add("002212024042023094310627776190762885120");
+        list.add("002212024042109541010627938373800124416");
+        list.add("002212024042207451110628268298934329344");
+        list.add("002212024042220074210628455161424855040");
+        list.add("002212024042307511610628632220004851712");
+        list.add("002212024042308012110628634756814118912");
+        list.add("002212024042308204710628639647745916928");
+        list.add("002212024042309213010628654927362727936");
+        list.add("002212024042407541510628995359758417920");
+        list.add("002212024042419503110629175610779844608");
+        list.add("002212024042507593310629359080569290752");
+        list.add("002212024042508162210629363310436741120");
+        list.add("002212024042508444810629370468299612160");
+        list.add("002212024042510044010629390566508900352");
+        list.add("002212024042608042610629722695250190336");
+        list.add("002212024042608254110629728043720839168");
+        list.add("002212024042608495310629734132524331008");
+        list.add("002212024042613574610629811616614793216");
+        list.add("002212024042808054110630447788521406464");
+        list.add("002212024042809245110630467710966120448");
+        list.add("002212024042823254410630679326345379840");
+        list.add("002212024042907322310630801794375454720");
+        list.add("002212024042913113810630887168829394944");
+        list.add("002212024043008265210631177893526605824");
+        list.add("002212024043008304710631178879007895552");
+        list.add("002212024043008514610631184158888271872");
+        list.add("002212024043008590110631185985480146944");
+        list.add("002212024043009003010631186356933967872");
+        list.add("002212024043010533110631214799365967872");
+        list.add("002212024050107092310631520782677000192");
+        list.add("002212024050107525610631531743152410624");
+        list.add("002212024050416563310632755709779451904");
+        list.add("002212024050515232310633094653215678464");
+        list.add("002212024050520055610633165758466428928");
+        list.add("002212024050520481310633176399665774592");
+        list.add("002212024050607533110633343829061480448");
+        list.add("002212024050607564510633344642827370496");
+        list.add("002212024050608283810633352666908696576");
+        list.add("002212024050608393610633355426893475840");
        return list;
    }