全款认款时临时车架号

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -4779,6 +4779,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //更新临时号
                 ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo);
             }
+        }else{
+            for (int i = 0; i < vinList.size(); i++) {
+                //销售订单中车辆表的sid
+                String salesOrderVinSid = vinList.get(i).getSid();
+                String temporaryNum = String.format("%02d", i + 1);
+                //更新临时号
+                ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNum);
+            }
+
         }
         //查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
         String key = depositInfo.getDepositTypeKey();
@@ -5718,7 +5727,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             String totaldiscount = appOrderDetailsVo.getTotaldiscount();
             if (StringUtils.isNotBlank(totaldiscount)) {
                 //计算单台优惠
-                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total));
+                BigDecimal bigDecimal = new BigDecimal(totaldiscount).divide(new BigDecimal(total),BigDecimal.ROUND_CEILING);
                 busSaleOrderVehicleOutVo.setTotaldiscount(bigDecimal.toString());
                 //赠送情况
                 List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1117,6 +1117,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
                             record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            record.setVin(temporaryNo);
                         }
                     }
                 }
@@ -1139,6 +1141,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     } else {
                         if ("2".equals(record.getPayTypeKey())) {
                             record.setVin(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            record.setVin(temporaryNo);
                         }
                     }
                 }

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

@@ -63,7 +63,6 @@ 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.apache.poi.hpsf.Decimal;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -211,6 +210,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     } else {
                         if ("2".equals(v.getPayTypeKey())) {
                             v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
+                        }else{
+                            v.setVIN(temporaryNo);
                         }
                     }
                 }