修改移动端销售订单订金为整数

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

@@ -1550,9 +1550,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             vo.setOrderInfo(orderInfo);
             vo.setState(type);
-            if(StringUtils.isNotBlank(orderInfo.getPrice())){
-                vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(orderInfo.getPrice()))));
-            }
+            vo.setPrice(orderInfo.getPrice());
 
 
         }
@@ -1648,14 +1646,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //订单选择的采购订单列表
             orderInfo.setReadyCarList(appReadyCarLists);
             if("1".equals(busSalesOrder.getPayTypeKey())){//全款
-                if(StringUtils.isNotBlank(data.getPrice())){
-                    Double doublePrice = Double.valueOf(data.getPrice());
-                    vo.setPrice(String.valueOf((int)Math.floor(doublePrice)));
-                }
+                vo.setPrice(data.getPrice());
             }else{
-                if(StringUtils.isNotBlank(data.getManufactorSettlementPrice())){
-                    vo.setPrice(String.valueOf((int)Math.floor(Double.valueOf(data.getManufactorSettlementPrice()))));
-                }
+                vo.setPrice(data.getManufactorSettlementPrice());
             }
 
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -156,21 +156,6 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
             vo.setOverallPrice(bigDecimalFinalPrice.toString());
         }
         vo.setSaleOrderSid(sid);
-        if(StringUtils.isNotBlank(vo.getGuidancePrice())){
-            vo.setGuidancePrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getGuidancePrice()))));
-        }
-        if(StringUtils.isNotBlank(vo.getTransactionPrice())){
-            vo.setTransactionPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTransactionPrice()))));
-        }
-        if(StringUtils.isNotBlank(vo.getOverallPrice())){
-            vo.setOverallPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getOverallPrice()))));
-        }
-        if(StringUtils.isNotBlank(vo.getTopAndTrailerPrice())){
-            vo.setTopAndTrailerPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTopAndTrailerPrice()))));
-        }
-        if(StringUtils.isNotBlank(vo.getTotalPrice())){
-            vo.setTotalPrice(String.valueOf((int)Math.floor(Double.valueOf(vo.getTotalPrice()))));
-        }
         return rb.success().setData(vo);
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -219,6 +219,8 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             //结算方式
             if("承兑".equals(finPaymentrecord.getPayWayValue())){
                 fpaybillentry.setFSETTLETYPEID("09");
+            }else{
+                fpaybillentry.setFSETTLETYPEID("02");
             }
             FPAYBILLENTRYs.add(fpaybillentry);
         }