Merge remote-tracking branch 'origin/master'

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-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);
     }
 }