From b2fe5fcc99d766d0168d8365058ff7e12275274c Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 16 Aug 2023 14:44:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=85=85=E5=80=BC=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=8E=A5=E5=8F=A3=E8=8E=B7=E5=8F=96openid=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=95=B0=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/api/uniapp/PayController.java | 16 +++++++++++----
 .../test/java/SpringBootTestController.java   | 20 +++++++++++++++++++
 .../adapay/config/InitializeAdapayConfig.java |  4 ++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
index 8199794a3..2f195237e 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
@@ -11,11 +11,14 @@ import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
+import com.jsowell.pile.domain.MemberBasicInfo;
 import com.jsowell.pile.dto.GetPayModeDTO;
 import com.jsowell.pile.dto.PayOrderDTO;
 import com.jsowell.pile.dto.PaymentScenarioDTO;
 import com.jsowell.pile.dto.WeixinPayDTO;
+import com.jsowell.pile.service.IMemberBasicInfoService;
 import com.jsowell.pile.vo.uniapp.PayModeVO;
+import com.jsowell.service.AgentDevService;
 import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
 import com.jsowell.pile.dto.ApplyRefundDTO;
@@ -47,6 +50,8 @@ public class PayController extends BaseController {
 	@Autowired
 	private RedisCache redisCache;
 
+	@Autowired
+	private IMemberBasicInfoService memberBasicInfoService;
 	/**
 	 * 充值余额支付/微信余额充值
 	 * 提供给小程序使用
@@ -258,11 +263,14 @@ public class PayController extends BaseController {
 			// 设置appId
 			dto.setAppId(request.getHeader("appId"));
 			// 获取openId
-			String openId = memberService.getOpenIdByCode(dto.getCode());
-			if (StringUtils.isBlank(openId)) {
-				throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
+			MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId);
+			if (memberBasicInfo == null) {
+				throw new BusinessException(ReturnCodeEnum.CODE_HANDLE_USER_INFO_ERROR);
 			}
-			dto.setOpenId(openId);
+			// if (StringUtils.isBlank(openId)) {
+			// 	throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
+			// }
+			dto.setOpenId(memberBasicInfo.getOpenId());
 			// 充值余额 附加参数
 			Map<String, Object> weixinMap = memberService.rechargeBalanceWithAdapay(dto);
 			response = new RestApiResponse<>(ImmutableMap.of("weixinMap", weixinMap));
diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index d974fac9c..46138bc6f 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -629,6 +629,26 @@ public class SpringBootTestController {
 		}
 	}
 
+	@Test
+	public void testFault() {
+		StringBuffer sb = new StringBuffer("0100");
+		String lowOrder = sb.substring(0, 2);
+		String highOrder = sb.substring(2, 4);
+
+		// String hardwareFault = highOrder + lowOrder;
+		byte[] hardwareFaultByteArr = BytesUtil.str2Bcd(highOrder + lowOrder);
+		String binStr = BytesUtil.bytes2BinStr(hardwareFaultByteArr);
+		// log.info("binStr:{}", binStr); // 0000 0000 0000 0001
+		int faultCode = 0;
+		for (int i = 0; i < binStr.length(); i++) {
+			if (binStr.charAt(i) == '1') {
+				faultCode = 15 - i;
+				break;
+			}
+		}
+		String faultReason = YKCPileFaultReasonEnum.getValueByCode(faultCode);
+		System.out.println(faultReason);
+	}
 
 
 	@Test
diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java
index dafb9c6f5..dce7b3c06 100644
--- a/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java
+++ b/jsowell-pile/src/main/java/com/jsowell/adapay/config/InitializeAdapayConfig.java
@@ -41,13 +41,13 @@ public class InitializeAdapayConfig implements CommandLineRunner {
 		/*
 		单商户
 		 */
-		singleMerchant();
+		// singleMerchant();
 
 		/*
 		多商户
 		目前有jsowell和xixiao
 		 */
-		// multiMerchant();
+		multiMerchant();
 	}
 
 	/**