Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Project: anrui-base(安瑞基础信息模块) <br/>
  * File: BaseVehicleModel.java <br/>
@@ -33,6 +35,9 @@ public class BaseVehicleModel extends BaseEntity {
     private String manufacturer;
 
     @ApiModelProperty("品牌(陕汽必须的字段)")
+    private String brandName;
+
+    @ApiModelProperty("品牌sid(陕汽必须的字段)")
     private String carBrand;
 
     @ApiModelProperty("车辆类型key值")
@@ -45,7 +50,6 @@ public class BaseVehicleModel extends BaseEntity {
     @ApiModelProperty("车型名称（产品名称）(陕汽必须的字段)")
     private String modelName;
 
-
     @ApiModelProperty("产品线key值")
     private String productLine;
     @ApiModelProperty("产品线value值")
@@ -107,6 +111,9 @@ public class BaseVehicleModel extends BaseEntity {
     @ApiModelProperty(value = "系别（欧曼特有）")
     private String department;
 
+    @ApiModelProperty(value = "系别Value（欧曼特有）")
+    private String departmentValue;
+
     @ApiModelProperty("是否可以删除（1是，0否）")
     private Integer isDel;
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java

@@ -40,6 +40,10 @@ public class BaseVehicleModelDto implements Dto {
 
     @ApiModelProperty(value = "品牌(陕汽必须的字段)", required = true)
     @NotBlank(message = "品牌不能为空")
+    private String brandName;
+
+    @ApiModelProperty(value = "品牌sid(陕汽必须的字段)", required = true)
+    @NotBlank(message = "品牌sid不能为空")
     private String carBrand;
 
     @ApiModelProperty(value = "车辆类型（牵引车、挂车等）(陕汽必须的字段)", required = true)
@@ -57,9 +61,9 @@ public class BaseVehicleModelDto implements Dto {
     @NotBlank(message = "车型编码不能为空")
     private String vehicleTypeCode;
 
-    @ApiModelProperty(value = "车型名称（产品名称）(陕汽必须的字段)", required = true)
+  /*  @ApiModelProperty(value = "车型名称（产品名称）(陕汽必须的字段)", required = true)
     @NotBlank(message = "车型名称不能为空")
-    private String modelName;
+    private String modelName;*/
 
     @ApiModelProperty(value = "产品线(陕汽必须的字段)", required = true)
     @NotBlank(message = "产品线不能为空")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@@ -46,6 +46,10 @@ public class BaseVehicleModelVo implements Vo {
     private String gearboxType;
     @ApiModelProperty(value = "燃料种类")
     private String fuelType;
+    @ApiModelProperty(value = "发动机型号")
+    private String engineTypeValue;
+    @ApiModelProperty(value = "车型编码")
+    private String vehicleTypeCode;
     @ApiModelProperty(value = "车辆版本")
     private String vehicleVersion;
     @ApiModelProperty(value = "车型图片")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContract.java

@@ -90,4 +90,6 @@ public class CommonContract extends BaseEntity {
     private Integer num;
     @ApiModelProperty("单价")
     private BigDecimal price;
+    @ApiModelProperty("单台订金")
+    private BigDecimal oneDeposit;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@@ -52,6 +52,8 @@ public class CommonContractVo implements Vo {
     private String num;
     @ApiModelProperty("单价")
     private String price;
+    @ApiModelProperty("单台订金")
+    private String oneDeposit;
     @ApiModelProperty("合同金额")
     private String contractAmount;
 	@ApiModelProperty("合同附件")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
+import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.ExportExcelUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -66,6 +67,9 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     @Autowired
     private BaseManufacturerService baseManufacturerService;
 
+    @Autowired
+    private BaseVehmodelConfigService baseVehmodelConfigService;
+
     @Override
     public ResultBean<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> pagerQuery) {
         ResultBean<PagerVo<BaseVehicleModelVo>> rb = ResultBean.fireFail();
@@ -104,11 +108,10 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign {
     @Override
     public ResultBean deleteBySids(String sids) {
         List<String> sidList = Arrays.asList(sids.split(","));
-
         for (String sid : sidList) {
             int count = baseVehicleModelService.updateBySidIsDelete(sid);
             //删除或批量删除车型配置信息
-            int count_one = baseModelConfigService.updateBySidIsDelete(sid);
+            int count_one = baseVehmodelConfigService.delByModelSid(sid);
             if (count == 0 && count_one == 0) {
                 return ResultBean.fireFail().setMsg("删除失败");
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -453,6 +453,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             String sid1 = entity.getSid();
             BeanUtil.copyProperties(dto, entity);
             entity.setSid(sid1);
+            entity.setModelName(entity.getVehicleTypeValue()+entity.getDriveFormValue()+entity.getGearboxTypeValue()+entity.getVehicleVersionValue()+entity.getProductLineValue()+entity.getPowerValue()+entity.getFuelTypeValue());
             boolean isSave = save(entity);
             if (!isSave) {
                 return rb.setMsg("车型信息保存失败");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.*;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -112,4 +113,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
     BaseVehmodelConfig getBySid(String sid);
 
     AppModelVeDetailVo getAppIntentionVehicleVo(@Param("useOrg") String useOrg, @Param("modelSid") String modelSid, @Param("configSid") String configSid);
+
+    @Delete("delete from base_vehmodel_config where modelSid = #{sid}")
+    int delByModelSid(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -376,4 +376,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg,modelSid,configSid);
         return vo;
     }
+
+    public int delByModelSid(String sid) {
+        return baseMapper.delByModelSid(sid);
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -25,7 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -53,7 +57,6 @@ import java.util.List;
 @FeignClient(
         contextId = "anrui-fin-FinUncollectedReceivablesDetailed",
         name = "anrui-fin",
-
         path = "finuncollectedreceivablesdetailed",
         fallback = FinUncollectedReceivablesDetailedFeignFallback.class)
 public interface FinUncollectedReceivablesDetailedFeign {
@@ -69,4 +72,9 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<FinUncollectedReceivablesDetailedVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("客户账单汇总分页列表")
+    @PostMapping("/customerBillListPage")
+    public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(@RequestBody PagerQuery<FinUncollectedReceivablesDetailedQuery> pq);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -25,7 +25,9 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -62,4 +64,9 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-fin/finuncollectedreceivablesdetailed/fetchBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedQuery.java

@@ -52,6 +52,16 @@ public class FinUncollectedReceivablesDetailedQuery implements Query {
     private String contractNo; // 合同编号
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
+    @ApiModelProperty("款项类型key")
+    private String paymentTypeKey; // 款项类型key
+    @ApiModelProperty("应收项目名称")
+    private String receivablesName; // 应收项目名称
+    @ApiModelProperty("生成开始时间")
+    private String createStartTime; // 生成开始时间
+    @ApiModelProperty("生成结束时间")
+    private String createEndTime; // 生成结束时间
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
 	@ApiModelProperty("联系电话")
     private String customerPhone; // 联系电话
     @ApiModelProperty("分公司sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedVo.java

@@ -52,8 +52,14 @@ public class FinUncollectedReceivablesDetailedVo implements Vo {
     private String sid; // 应收未收款项sid
 	@ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
+    @ApiModelProperty("合同编号sid")
+    private String contractSid; // 合同编号sid
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
+    @ApiModelProperty("款项类型value")
+    private String paymentTypeValue; // 款项类型value
+    @ApiModelProperty("认款状态")
+    private String subscriptionState; // 认款状态
 	@ApiModelProperty("车架号")
     private String VIN; // 车架号
 	@ApiModelProperty("联系电话")
@@ -62,4 +68,14 @@ public class FinUncollectedReceivablesDetailedVo implements Vo {
     private String receivablesName; // 应收项目名称
 	@ApiModelProperty("当前应收金额")
     private String currentReceivableMoney; // 当前应收金额
+    @ApiModelProperty("认款金额")
+    private String subscriptionMoney; // 认款金额
+    @ApiModelProperty("未认款金额")
+    private String noSubscriptionMoney; // 未认款金额
+    @ApiModelProperty("生成时间")
+    private String createTime; // 生成时间
+    @ApiModelProperty("最新处理时间")
+    private String newModifyTime; // 最新处理时间
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -69,4 +69,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
 
 	@Update("update fin_uncollected_receivables_detailed set currentReceivableMoney = #{curRecMoney} where sid = #{sid}")
     void updateCurRecMoneyBySid(String curRecMoney, String sid);
+
+	List<FinUncollectedReceivablesDetailedVo> selectGroupConAndRecAndPay(String contractNo, String receivablesName, String paymentTypeValue);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -4,7 +4,15 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
-		SELECT * FROM fin_uncollected_receivables_detailed <where> ${ew.sqlSegment} </where>
+		SELECT
+		furd.`customerName`,
+		furd.`contractNo`,
+		furd.`paymentTypeValue`,
+		furd.`receivablesName`,
+		furd.`createTime`,
+		furd.`remarks`
+		FROM
+		fin_uncollected_receivables_detailed furd  <where> ${ew.sqlSegment} </where>
 	</select>
 	
 	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
@@ -20,4 +28,15 @@
 		WHERE VIN = #{vin}
 		  AND receivablesName = #{receivablesName}
 	</select>
+
+	<select id="selectGroupConAndRecAndPay"
+			resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo">
+		SELECT
+				receivablesName,
+				SUM(subscriptionMoney) subscriptionMoney
+		FROM
+				fin_selected_receivables_detailed fsrd
+		WHERE auditState = 3
+		GROUP BY contractNo,receivablesName
+	</select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -25,11 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,4 +85,11 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
 		FinUncollectedReceivablesDetailedVo vo = new FinUncollectedReceivablesDetailedVo();
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<PagerVo<FinUncollectedReceivablesDetailedVo>> customerBillListPage(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<FinUncollectedReceivablesDetailedVo> pv = finUncollectedReceivablesDetailedService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -26,14 +26,25 @@
 package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationQuery;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedQuery;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -54,6 +65,10 @@ import java.util.List;
  */
 @Service
 public class FinUncollectedReceivablesDetailedService extends MybatisBaseService<FinUncollectedReceivablesDetailedMapper, FinUncollectedReceivablesDetailed> {
+
+	@Autowired
+	private CommonContractFeign commonContractFeign;
+
 	private QueryWrapper<FinUncollectedReceivablesDetailed> createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -70,6 +85,17 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
 		if (StringUtils.isNotBlank(query.getCustomerPhone())) {
 			qw.eq("customerPhone", query.getCustomerPhone());
 		}
+		if (StringUtils.isNotBlank(query.getPaymentTypeKey())) {
+			qw.eq("paymentTypeKey", query.getPaymentTypeKey());
+		}
+		if (StringUtils.isNotBlank(query.getSubscriptionState())) {
+			qw.eq("subscriptionState", query.getSubscriptionState());
+		}
+		String createStartTime = query.getCreateStartTime();
+		String createEndTime = query.getCreateEndTime();
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
 		return qw;
 	}
 	
@@ -98,4 +124,63 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
 	public void updateCurRecMoneyBySid(String curRecMoney, String sid) {
 		baseMapper.updateCurRecMoneyBySid(curRecMoney,sid);
 	}
+
+	public PagerVo<FinUncollectedReceivablesDetailedVo> listPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
+		FinUncollectedReceivablesDetailedQuery params = pq.getParams();
+		QueryWrapper<FinUncollectedReceivablesDetailed> qw = createQueryWrapper(params);
+		IPage<FinUncollectedReceivablesDetailed> page = PagerUtil.queryToPage(pq);
+		IPage<FinUncollectedReceivablesDetailedVo> pagging = baseMapper.selectPageVo(page, qw);
+		List<FinUncollectedReceivablesDetailedVo> records = pagging.getRecords();
+		for (FinUncollectedReceivablesDetailedVo record : records) {
+			BigDecimal totalDeposit = null;
+			BigDecimal totalPrice = null;
+			BigDecimal noSubscriptionMoney = null;
+			String contractSid = record.getContractSid();
+			String contractNo = record.getContractNo();
+			String receivablesName = record.getReceivablesName();
+			String paymentTypeValue = record.getPaymentTypeValue();
+			ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(contractSid);
+			CommonContractVo data = commonContractVoResultBean.getData();
+			if (receivablesName.equals("订金")){
+				BigDecimal oneDeposit = new BigDecimal(data.getOneDeposit());
+				BigDecimal num = new BigDecimal(data.getNum());
+				totalDeposit = oneDeposit.multiply(num);
+				record.setCurrentReceivableMoney(String.valueOf(totalDeposit));
+			}else if (receivablesName.equals("车款")){
+				BigDecimal price = new BigDecimal(data.getPrice());
+				BigDecimal num = new BigDecimal(data.getNum());
+				totalPrice = price.multiply(num);
+				record.setCurrentReceivableMoney(String.valueOf(totalPrice));
+			}
+			List<FinUncollectedReceivablesDetailedVo> finUncollectedReceivablesDetailedVos = baseMapper.selectGroupConAndRecAndPay(contractNo, receivablesName, paymentTypeValue);
+			for (FinUncollectedReceivablesDetailedVo finUncollectedReceivablesDetailedVo : finUncollectedReceivablesDetailedVos) {
+				String receivablesName1 = finUncollectedReceivablesDetailedVo.getReceivablesName();
+				String subscriptionMoney = finUncollectedReceivablesDetailedVo.getSubscriptionMoney();
+				if (receivablesName1.equals("订金")){
+					record.setSubscriptionMoney(subscriptionMoney);
+					noSubscriptionMoney = totalDeposit.subtract(new BigDecimal(subscriptionMoney));
+					record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
+					if (subscriptionMoney.equals(0)){
+						record.setSubscriptionState("未认款");
+					}else if(subscriptionMoney.equals(totalDeposit)){
+						record.setSubscriptionState("已认款");
+					}else {
+						record.setSubscriptionState("部分认款");
+					}
+				}else if (receivablesName1.equals("车款")){
+					noSubscriptionMoney = totalPrice.subtract(new BigDecimal(subscriptionMoney));
+					record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney));
+					if (subscriptionMoney.equals(0)){
+						record.setSubscriptionState("未认款");
+					}else if(subscriptionMoney.equals(totalPrice)){
+						record.setSubscriptionState("已认款");
+					}else {
+						record.setSubscriptionState("部分认款");
+					}
+				}
+			}
+		}
+		PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
 }