zouxuan пре 3 недеља
родитељ
комит
e7c151a627

+ 3 - 3
mec-application/src/main/java/com/ym/mec/web/controller/HfMerchantConfigController.java

@@ -68,9 +68,9 @@ public class HfMerchantConfigController extends BaseController {
     }
 
     @ApiOperation("根据机构id查询汇付商户配置")
-    @GetMapping(value = "/queryByTenantId")
-    public HttpResponseResult<HfMerchantConfig> queryByTenantId(String payerName, Integer id) {
-        return succeed(hfMerchantConfigService.queryByTenantId(id, payerName));
+    @GetMapping(value = "/queryByTenantId/{id}")
+    public HttpResponseResult<HfMerchantConfig> queryByTenantId(@ApiParam(value = "机构id", required = true) @PathVariable Integer id) {
+        return succeed(hfMerchantConfigService.queryByTenantId(id));
     }
 
     @ApiOperation("分页查询汇付商户配置")

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/HfMerchantConfigDao.java

@@ -7,5 +7,5 @@ import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 
 public interface HfMerchantConfigDao extends BaseDAO<Integer, HfMerchantConfig> {
 
-	HfMerchantConfig queryByTenantId(@Param("tenantId") Integer tenantId, @Param("payerName") String payerName);
+	HfMerchantConfig queryByTenantId(@Param("tenantId") Integer tenantId);
 }

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/HfMerchantConfigService.java

@@ -5,5 +5,5 @@ import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 
 public interface HfMerchantConfigService extends BaseService<Integer, HfMerchantConfig> {
 
-	HfMerchantConfig queryByTenantId(Integer tenantId, String payerName);
+	HfMerchantConfig queryByTenantId(Integer tenantId);
 }

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/HfMerchantConfigServiceImpl.java

@@ -113,8 +113,8 @@ public class HfMerchantConfigServiceImpl extends BaseServiceImpl<Integer, HfMerc
 	}*/
 
 	@Override
-	public HfMerchantConfig queryByTenantId(Integer tenantId, String payerName) {
-		return hfMerchantConfigDao.queryByTenantId(tenantId, payerName);
+	public HfMerchantConfig queryByTenantId(Integer tenantId) {
+		return hfMerchantConfigDao.queryByTenantId(tenantId);
 	}
 	
 }

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/HfMerchantConfigMapper.xml

@@ -134,7 +134,7 @@
 	</select>
 	
 	<select id="queryByTenantId" resultMap="HfMerchantConfig">
-		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId} AND payer_name_ = #{payerName}
+		SELECT * FROM hf_merchant_config where tenant_id_ = #{tenantId} AND payer_name_ = 'YEEPAY'
 	</select>
 
     <sql id="queryPageSql">