修改费率和押金

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMachineServiceImpl.java

@@ -369,9 +369,8 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
                     .posSn(kxsMachine.getPosSn())
                     .deposit(param.getCashPledge())
                     .brandId(kxsMachine.getBrandId())
+                    .callBackUrl("")
                     .build();
-            HashMap<String, Object> reqParam = new HashMap<>();
-            reqParam.put("value", JSON.toJSONString(req));
             R res = remoteOldService.depositSet(req);
             if(res.getStatus() == CommonConstants.SUCCESS){
                 kxsMachine.setCashPledge(param.getCashPledge());

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsMerchantServiceImpl.java

@@ -210,10 +210,9 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
                 .posSn(kxsMachine.getPosSn())
                 .brandId(kxsMachine.getBrandId())
                 .feeRate(param.getMachineRatio())
+                .callBackUrl("")
                 .build();
-        HashMap<String, Object> reqParam = new HashMap<>();
-        reqParam.put("value", JSON.toJSONString(req));
-        R res = remoteOldService.feeSet(reqParam);
+        R res = remoteOldService.feeSet(req);
 
         if(res.getStatus() != CommonConstants.SUCCESS){
             throw new GlobalCustomerException("修改费率失败");

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/RemoteOldService.java

@@ -52,7 +52,7 @@ public interface RemoteOldService {
 	 * @return {@link R}
 	 */
 	@PostExchange("/api/v1/fee/set")
-	R feeSet(@RequestParam Map<String, Object>  param);
+	R feeSet(@RequestBody Object  param);
 
 	/**
 	 * 团队开机统计-开机统计查询

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/feign/config/KxsOldApFeignClientConfiguration.java

@@ -1,5 +1,6 @@
 package com.kxs.system.api.feign.config;
 
+import com.kxs.common.core.constant.ServiceNameConstants;
 import com.kxs.system.api.feign.RemoteOldService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -38,7 +39,7 @@ public class KxsOldApFeignClientConfiguration {
 	 */
 	@Bean
 	RemoteOldService remoteOldService(@Qualifier("kxsOldFeignClient") WebClient client) {
-		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).blockTimeout(ServiceNameConstants.REQ_TIMEOUT).build();
 		return factory.createClient(RemoteOldService.class);
 	}