浏览代码

服务站分成

qin 1 年之前
父节点
当前提交
045cb04535
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

+ 3 - 1
src/main/java/com/poteviohealth/ym/ipos/service/impl/MerchantServiceImpl.java

@@ -281,7 +281,9 @@ public class MerchantServiceImpl implements IMerchantService {
         if(source.equals(3)){
             vaultsResponse =  customerFeignClient.updateMerchantId(operatorIdParams);
         }else{
-            operatorIdParams.setProportion(proportion.divide(new BigDecimal(100.0)));
+            if(proportion != null){
+                operatorIdParams.setProportion(proportion.divide(new BigDecimal(100.0)));
+            }
             vaultsResponse =  partnerFeignClient.updateMerchantId(operatorIdParams);
         }