区域运营商分账比例

src/main/java/com/poteviohealth/ym/ipos/model/merchant/back/UserSearchBack.java

@@ -4,6 +4,7 @@ import com.poteviohealth.ym.ipos.model.back.BaseBack;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -124,6 +125,10 @@ public class UserSearchBack extends BaseBack {
     @ApiModelProperty(value = "结算摘要")
     private String settle_abstract;
 
+
+    @ApiModelProperty("分账比例(自用)")
+    private BigDecimal proportion;
+
     @ApiModelProperty(value = "图片列表")
     private List<ImageListBack> image_list;
 }

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.facade.cache.CacheService;
 import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.integrated.OperatorIdParams;
 import com.poteviohealth.cgp.common.integrated.customer.CustomerFeignClient;
@@ -50,6 +51,8 @@ public class MerchantServiceImpl implements IMerchantService {
     private IAreaService areaService;
     @Resource
     private IPaymentService paymentService;
+    @Resource
+    private CacheService cacheService;
 
     /**
      * 上传图片
@@ -278,7 +281,7 @@ public class MerchantServiceImpl implements IMerchantService {
         if(source.equals(3)){
             vaultsResponse =  customerFeignClient.updateMerchantId(operatorIdParams);
         }else{
-            operatorIdParams.setProportion(proportion);
+            operatorIdParams.setProportion(proportion.divide(new BigDecimal(100.0)));
             vaultsResponse =  partnerFeignClient.updateMerchantId(operatorIdParams);
         }
 
@@ -633,6 +636,7 @@ public class MerchantServiceImpl implements IMerchantService {
             }
             back = JSONObject.toJavaObject(jsonObject, UserSearchBack.class);
 
+            back.setProportion(new BigDecimal(cacheService.get("supplier_pro")).multiply(new BigDecimal(100)));
         } catch (IllegalAccessException e) {
             e.printStackTrace();
             return VaultsResponse.failed(e.getMessage());