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 38d5660a9..760797e2d 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 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 dd59f6f90..f1167b8a0 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(); } /**