第三方支付

src/main/java/com/poteviohealth/ym/ipos/controller/MerchantController.java

@@ -55,7 +55,7 @@ public class MerchantController  extends BaseWebController {
         bd.setAppId("wx31cd5ff619b017f7");
         bd.setPosId("ZKY");
         bd.setStoreId("19");
-        bd.setName("(ZKY)北京无向图");
+        bd.setName("(ZKY)秦鹏飞");
         return paymentService.bindPos(bd);
     }
 

src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -27,8 +27,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -157,6 +155,13 @@ public class MerchantServiceImpl implements IMerchantService {
             }
             if(status != 2){
                VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2);
+
+               if(!stringVault.validate()){
+                   return stringVault;
+               }else if(StringUtils.isEmpty(stringVault.getData())){
+                   return VaultsResponse.failed("APPid为空");
+               }
+
                if(dto.getSourceId().equals(1)){
                    //终端绑定交易
                    BindDto bd = new BindDto();
@@ -218,7 +223,7 @@ public class MerchantServiceImpl implements IMerchantService {
     }
 
     private VaultsResponse updateMerchantId(Integer id, Integer source, String merchantId,Integer status) {
-        VaultsResponse vaultsResponse = VaultsResponse.success(merchantId);
+        VaultsResponse vaultsResponse = VaultsResponse.failed();
         OperatorIdParams operatorIdParams = new OperatorIdParams();
         operatorIdParams.setOperatorId(id);
         operatorIdParams.setId(merchantId);
@@ -231,10 +236,7 @@ public class MerchantServiceImpl implements IMerchantService {
                 return cus;
             }
         }else{
-            VaultsResponse par =  partnerFeignClient.updateMerchantId(operatorIdParams);
-            if(!par.validate()){
-                return par;
-            }
+            vaultsResponse =  partnerFeignClient.updateMerchantId(operatorIdParams);
         }
 
         return vaultsResponse;
@@ -484,16 +486,6 @@ public class MerchantServiceImpl implements IMerchantService {
      */
     @Override
     public VaultsResponse<UserSearchBack> merchantQuery(String phone, String merchantId){
-        try {
-            InetAddress localHost = InetAddress.getLocalHost();
-            String hostAddress = localHost.getHostAddress();
-            String hostName = localHost.getHostName();
-            log.info("localHost==="+localHost);
-            log.info("hostAddress==="+hostAddress);
-            log.info("hostName==="+hostName);
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
         UserSearch userSearch = new UserSearch();
         UserSearchDetail detail = new UserSearchDetail();
         detail.setPhone(phone);