diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index c79eba349..fadcdab67 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -38,6 +38,7 @@ import com.jsowell.pile.domain.ClearingWithdrawInfo; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.PayOrderDTO; import com.jsowell.pile.service.*; +import com.jsowell.pile.vo.base.MerchantInfoVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -267,7 +268,10 @@ public class AdapayService { // 审核失败 if (Constants.TWO.equals(adapayMemberAccount.getStatus())) { AdapayCorpMemberVO adapayCorpMemberVO = new AdapayCorpMemberVO(); - adapayCorpMemberVO.setName(""); + MerchantInfoVO merchantInfoVO = pileMerchantInfoService.getMerchantInfoVO(adapayMemberAccount.getMerchantId()); + if (merchantInfoVO != null) { + adapayCorpMemberVO.setName(merchantInfoVO.getMerchantName()); + } adapayCorpMemberVO.setAuditState("B"); adapayCorpMemberVO.setAuditDesc(adapayMemberAccount.getRemark()); map.put("adapayCorpMember", adapayCorpMemberVO); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 8d65aea31..382993679 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -312,13 +312,6 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService { if (pileMerchantInfo == null) { return null; } - // MerchantInfoVO vo = MerchantInfoVO.builder() - // .merchantId(merchantId) - // .merchantName(pileMerchantInfo.getMerchantName()) - // .merchantTel(pileMerchantInfo.getServicePhone()) - // .organizationCode(pileMerchantInfo.getOrganizationCode()) - // .deptId(pileMerchantInfo.getDeptId()) - // .build(); return conversion2MerchantInfoVO(pileMerchantInfo); }