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 94478d460..bf8e8c031 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,7 +5,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; import com.jsowell.adapay.service.AdapayMemberService; import com.jsowell.adapay.vo.AdapayAccountBalanceVO; -import com.jsowell.adapay.vo.AdapayMemberInfoVO; +import com.jsowell.adapay.vo.AdapayMemberVO; import com.jsowell.adapay.vo.AdapaySettleAccountVO; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; @@ -52,7 +52,7 @@ public class AdapayMemberController extends BaseController { public AjaxResult selectAdapayMember(@RequestBody AdapayMemberInfoDTO dto) { AjaxResult result; try { - AdapayMemberInfoVO vo = adapayMemberService.selectAdapayMember(dto.getMerchantId()); + AdapayMemberVO vo = adapayMemberService.selectAdapayMember(dto.getMerchantId()); result = AjaxResult.success(vo); } catch (Exception e) { logger.error("查询汇付会员接口异常", e); 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 293d8689c..d1fd53323 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 @@ -10,7 +10,7 @@ import com.huifu.adapay.model.Member; import com.huifu.adapay.model.SettleAccount; import com.jsowell.adapay.dto.AdapayMemberInfoDTO; import com.jsowell.adapay.vo.AdapayAccountBalanceVO; -import com.jsowell.adapay.vo.AdapayMemberInfoVO; +import com.jsowell.adapay.vo.AdapayMemberVO; import com.jsowell.adapay.vo.AdapaySettleAccountVO; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.StringUtils; @@ -137,8 +137,8 @@ public class AdapayMemberService { * @param merchantId * @return */ - public AdapayMemberInfoVO selectAdapayMember(String merchantId) { - AdapayMemberInfoVO resultVO = new AdapayMemberInfoVO(); + public AdapayMemberVO selectAdapayMember(String merchantId) { + AdapayMemberVO resultVO = new AdapayMemberVO(); AdapayMemberInfo adapayMemberInfo = adapayMemberInfoService.selectByMerchantId(merchantId); if (adapayMemberInfo != null) { BeanUtils.copyProperties(adapayMemberInfo, resultVO); diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberVO.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberVO.java index 4d71b2529..3cc8d9cb5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/vo/AdapayMemberVO.java @@ -7,7 +7,7 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor @Builder -public class AdapayMemberInfoVO { +public class AdapayMemberVO { // 运营商id private String merchantId; // 地址