Merge branch 'master-vehicle-price' into dev-tiande

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/WalletCathApplyDTO.java

 package com.xxfc.platform.order.pojo.dto;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.vo.DataInter;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,7 +28,7 @@ public class WalletCathApplyDTO {
 
 
     @ApiModelProperty("门店")
-    private  List<Integer> companyIds;
+    private  List<JSONObject> companyIds;
 
 
     @ApiModelProperty("提现金额")

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/CompanyWalletCathBiz.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 
 import cn.hutool.core.lang.Snowflake;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.constant.WithDrawStatusEnum;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -68,11 +69,12 @@ public class CompanyWalletCathBiz extends BaseBiz<CompanyWalletCathMapper, Compa
         if (walletCathApplyDTO == null) {
             throw  new BaseException("参数不能为空",ResultCode.NULL_CODE);
         }
-        List<Integer> companyIds = walletCathApplyDTO.getCompanyIds();
-        for (Integer companyId:companyIds){
+        List<JSONObject> companyIds = walletCathApplyDTO.getCompanyIds();
+        for (JSONObject object:companyIds){
             CompanyWalletCath walletCathDTO=new CompanyWalletCath();
             BeanUtils.copyProperties(walletCathApplyDTO,walletCathDTO);
-            walletCathDTO.setCompanyId(companyId);
+            walletCathDTO.setCompanyId(object.getInteger("companyId"));
+            walletCathDTO.setAmount(object.getBigDecimal("amount"));
             applyCath(walletCathDTO);
         }
     }