Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -812,7 +812,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
         String businessTaskId = baseVehicleActualSales.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
-            if (businessTaskId.equals(query.getTaskId())) {
+            if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
@@ -826,7 +826,24 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
                 updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
                 return rb.success().setData(resultBean.getData());
+            }else{
+                if (businessTaskId.equals(query.getTaskId())) {
+                    FlowTaskVo flowTaskVo = new FlowTaskVo();
+                    BeanUtil.copyProperties(query, flowTaskVo);
+                    ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                    if (!resultBean.getSuccess()) {
+                        return rb.setMsg(resultBean.getMsg());
+                    }
+                    Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
+                    updateFlowFiled(paramMap);
+                    //更新车辆状态为未买断
+                    String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                    String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                    updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
+                    return rb.success().setData(resultBean.getData());
+                }
             }
+
         }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@@ -158,4 +158,7 @@ public class SolutionsDetailsssVo {
     @ApiModelProperty("上装成交价")
     private String szPrice;
 
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -303,9 +303,8 @@
         fd.useOrgSid
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
-        where fd.receivablesName != '订金' and fd.auditState = 3
         <where>
-            ${ew.sqlSegment}
+            ${ew.sqlSegment} and fd.receivablesName != '订金' and fd.auditState = 3
             <if test="name != null and name != ''">
                 and concat(IFNULL(fd.customerName
                 , '')

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -332,9 +332,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         FinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
-            qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
+            qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
         } else {
-            qw.eq("purchaseSystemSid", "0");
+            qw.eq("furd.purchaseSystemSid", "0");
         }
         String useOrgSid = "";
         String orgPath = pagerQuery.getParams().getOrgPath();
@@ -345,10 +345,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }
         if (StringUtils.isNotBlank(useOrgSid)) {
-            qw.eq("useOrgSid", useOrgSid);
+            qw.eq("fd.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(userSid)) {
-            qw.eq("createBySid", userSid);
+            qw.eq("fd.createBySid", userSid);
         }
         //查询没有认完的车辆sid
        /* List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid);
@@ -396,6 +396,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             }
         } else {
             for (FinSelectReceivablesDetailedVo record : collList) {
+                BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
+                BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
+                if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
+                    record.setReveivableMoney("0");
+                }else{
+                    BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
+                    if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
+                        record.setReveivableMoney("0");
+                    }else{
+                        record.setReveivableMoney(bigDecimal1.toString());
+                    }
+                }
                 record.setSubscribedOf(1);
                 String busVinSid = record.getBusVinSid();
                 ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -299,6 +299,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
+            //根据sid查询该申请下的车辆
+            List<String> vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid());
+            String vin = String.join(",",vinList);
+            record.setVin(vin);
             if(query.getUserSid().equals(record.getCreateBySid())){
                 record.setAllowModify(true);
             }else{

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java

@@ -75,4 +75,6 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper<ScmVehicleGressi
 
     @Select("select * from scm_vehicle_gression_veh where vehVin =#{vin} ")
     List<ScmVehicleGressionVehDetailsVo> fetchVoByVins(@Param("vin") String vin);
+
+    List<String> selectByMainSid(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml

@@ -12,4 +12,8 @@
         SELECT * FROM scm_vehicle_gression_veh
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="selectByMainSid" resultType="java.lang.String">
+        select vehVin from scm_vehicle_gression_veh where mainSid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java

@@ -126,4 +126,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
             baseMapper.insert(scmVehicleGressionVeh);
         }
     }
+
+    public List<String> selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue

@@ -181,7 +181,7 @@ export default {
       this.centerDialogVisible = true
       var params = {
         deployId: row.procDefId,
-        procInsId: row.procInstId,
+        procInsId: row.procInstSid,
         token: getStorage()
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java

@@ -41,7 +41,6 @@ public class CollectedReceivablesDetailedVo implements Vo {
 
 
     @ApiModelProperty("剩余金额")
-    @JsonProperty("receivable")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -233,7 +233,10 @@ public class AppFinCollectionConfirmationService {
         ResultBean<PagerVo<CollectedReceivablesDetailedVo>> rb = ResultBean.fireFail();
         PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq);
-        PagerVo<CollectedReceivablesDetailedVo> vo = CoverUtils.selectPagerVo(paymentDetailsList.getData());
-        return rb.success().setData(vo);
+        List<CollectedReceivablesDetailedVo> voList = Optional.ofNullable(paymentDetailsList.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CollectedReceivablesDetailedVo.class)).collect(Collectors.toList());
+        PagerVo<CollectedReceivablesDetailedVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(paymentDetailsList.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 }