diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java index ea692599e..7445eace0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/AdapayMemberController.java @@ -5,6 +5,7 @@ import com.jsowell.adapay.service.AdapayMemberService; import com.jsowell.adapay.vo.AdapayMemberInfoVO; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.exception.BusinessException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,12 +25,19 @@ public class AdapayMemberController extends BaseController { */ @PostMapping("/createAdapayMember") public AjaxResult createAdapayMember(@RequestBody AdapayMemberInfoDTO dto) { + logger.info("创建汇付会员接口 param:{}", dto); + AjaxResult result; try { adapayMemberService.createMember(dto); + result = AjaxResult.success(); + } catch (BusinessException e) { + logger.warn("创建汇付会员接口warn", e); + result = AjaxResult.error(e.getMessage()); } catch (Exception e) { - throw new RuntimeException(e); + logger.warn("创建汇付会员接口error", e); + result = AjaxResult.error("创建汇付会员接口异常"); } - return AjaxResult.success(); + return result; } /** diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java index 1e0b9fe14..4167184a5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayMemberService.java @@ -8,6 +8,7 @@ import com.google.common.collect.Maps; import com.huifu.adapay.model.Member; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; import com.jsowell.adapay.vo.AdapayMemberInfoVO; +import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.AdapayMemberInfo; @@ -138,15 +139,17 @@ public class AdapayMemberService { log.info("创建用户,返回参数:" + JSON.toJSONString(member)); log.info("=======execute CreateMember end======="); - // 创建成功保存到数据库 - if (member != null && StringUtils.equals((String)member.get("status"), "succeeded")) { - JSONObject jsonObject = JSON.parseObject(String.valueOf(member)); - ObjectMapper mapper = new ObjectMapper(); - mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); - AdapayMemberInfo adapayMemberInfo = mapper.readValue(jsonObject.toJSONString(), AdapayMemberInfo.class); - adapayMemberInfo.setMerchantId(dto.getMerchantId()); - adapayMemberInfoService.insert(adapayMemberInfo); + if (member == null || StringUtils.equals((String)member.get("status"), "failed")) { + String errorMsg = member == null ? "创建汇付用户失败" : (String) member.get("error_msg"); + throw new BusinessException("00500001", errorMsg); } + // 创建成功保存到数据库 + JSONObject jsonObject = JSON.parseObject(String.valueOf(member)); + ObjectMapper mapper = new ObjectMapper(); + mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); + AdapayMemberInfo adapayMemberInfo = mapper.readValue(jsonObject.toJSONString(), AdapayMemberInfo.class); + adapayMemberInfo.setMerchantId(dto.getMerchantId()); + adapayMemberInfoService.insert(adapayMemberInfo); } public AdapayMemberInfoVO selectAdapayMember(String merchantId) {