区域运营商分账比例

src/main/java/com/poteviohealth/ym/ipos/model/merchant/dto/UserDto.java

@@ -3,6 +3,7 @@ package com.poteviohealth.ym.ipos.model.merchant.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -134,6 +135,9 @@ public class UserDto {
     @ApiModelProperty(value = "商户状态,0：待进件，-1：进件失败(开户失败)，2：进件成功(已开户并且业务入驻成功)，3：通道开户成功(已开户，但未做业务入驻或业务入驻失败)")
     private String incoming_status;
 
+    @ApiModelProperty(value = "分成比例")
+    private BigDecimal proportion;
+
     @ApiModelProperty(value = "图片信息")
     private List<ImageListDto> image_list;
 }

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

@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -133,7 +134,7 @@ public class MerchantServiceImpl implements IMerchantService {
             }
             VaultsResponse<String> openModifyVault = this.merchantOpenModify(dto);
 
-            VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt(),basicConfig.getCode());
+            VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt(),basicConfig.getCode(),dto.getProportion());
             if(!stringVault.validate()){
                 log.info("stringVault==="+stringVault);
                 return stringVault;
@@ -175,7 +176,7 @@ public class MerchantServiceImpl implements IMerchantService {
                         return entregisterVault;
                     }
                 }
-                updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),3,dto.getRemained_amt(),basicConfig.getCode());
+                updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),3,dto.getRemained_amt(),basicConfig.getCode(),dto.getProportion());
             }else{
                 VaultsResponse<String> indvmodifyVault = this.modifyVault(dto);
                 if(!indvmodifyVault.validate()){
@@ -191,7 +192,7 @@ public class MerchantServiceImpl implements IMerchantService {
                 return openVault;
             }
            // if(status != 2){
-                VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt(),basicConfig.getCode());
+                VaultsResponse<String> stringVault = updateMerchantId(dto.getId(), dto.getSourceId(), dto.getMerchant_id(),2,dto.getRemained_amt(),basicConfig.getCode(),dto.getProportion());
 
                 if(!stringVault.validate()){
                     log.info("stringVault==="+stringVault);
@@ -255,7 +256,7 @@ public class MerchantServiceImpl implements IMerchantService {
         }
 
         if(YmUtil.SUCCESS.equals(back.getResult().getId())){
-           VaultsResponse vaultsResponse = updateMerchantId(dto.getId(), dto.getSourceId(), back.getMerchant_id(),0,dto.getRemained_amt(),bc.getCode());
+           VaultsResponse vaultsResponse = updateMerchantId(dto.getId(), dto.getSourceId(), back.getMerchant_id(),0,dto.getRemained_amt(),bc.getCode(),dto.getProportion());
            if(!vaultsResponse.validate()){
                return vaultsResponse;
            }
@@ -264,7 +265,7 @@ public class MerchantServiceImpl implements IMerchantService {
         return VaultsResponse.failed(back.getResult().getComment());
     }
 
-    private VaultsResponse updateMerchantId(Integer id, Integer source, String merchantId,Integer status,Long remainedAmt,String code) {
+    private VaultsResponse updateMerchantId(Integer id, Integer source, String merchantId, Integer status, Long remainedAmt, String code, BigDecimal proportion) {
         VaultsResponse vaultsResponse;
         OperatorIdParams operatorIdParams = new OperatorIdParams();
         operatorIdParams.setOperatorId(TokenContext.cureOperatorId());
@@ -277,6 +278,7 @@ public class MerchantServiceImpl implements IMerchantService {
         if(source.equals(3)){
             vaultsResponse =  customerFeignClient.updateMerchantId(operatorIdParams);
         }else{
+            operatorIdParams.setProportion(proportion);
             vaultsResponse =  partnerFeignClient.updateMerchantId(operatorIdParams);
         }