qin пре 1 година
родитељ
комит
8afb28a5f2

+ 4 - 2
src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -3,6 +3,7 @@ package com.poteviohealth.ym.ipos.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.integrated.OperatorIdParams;
 import com.poteviohealth.cgp.common.integrated.customer.CustomerFeignClient;
 import com.poteviohealth.cgp.common.integrated.partner.PartnerFeignClient;
@@ -230,8 +231,9 @@ public class MerchantServiceImpl implements IMerchantService {
     private VaultsResponse updateMerchantId(Integer id, Integer source, String merchantId,Integer status,Long remainedAmt) {
         VaultsResponse vaultsResponse = VaultsResponse.failed();
         OperatorIdParams operatorIdParams = new OperatorIdParams();
-        operatorIdParams.setOperatorId(id);
-        operatorIdParams.setId(merchantId);
+        operatorIdParams.setOperatorId(TokenContext.cureOperatorId());
+        operatorIdParams.setId(id.toString());
+        operatorIdParams.setMerchantId(merchantId);
         operatorIdParams.setSource(source);
         operatorIdParams.setStatus(status);
         operatorIdParams.setCode(code);