1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -85,6 +85,9 @@ public class SalesOrderController {
         Integer companyId = user.getCompanyId();
         order.setCompanyId(companyId);
         order.setCreatorId(user.getId());
+        if(order.getPrice()!=null){
+            order.setUnReceivedPayment(order.getPrice());
+        }
         int count;
         if(order.getId()==null){
             count = salesOrderService.count(new LambdaQueryWrapper<SalesOrder>().eq(SalesOrder::getCompanyId, companyId).eq(SalesOrder::getOrderCode, order.getOrderCode()));
@@ -357,7 +360,6 @@ public class SalesOrderController {
     public HttpRespMsg paymentCollection(Integer orderId,Double money){
         HttpRespMsg msg=new HttpRespMsg();
         SalesOrder salesOrder = salesOrderService.getById(orderId);
-        BigDecimal price = salesOrder.getPrice();
         SalesOrderPayment salesOrderPayment=new SalesOrderPayment();
         salesOrderPayment.setMoney(new BigDecimal(money));
         salesOrderPayment.setOrderId(orderId);
@@ -366,8 +368,8 @@ public class SalesOrderController {
         //订单未回款金额
         BigDecimal unReceivedPayment = salesOrder.getUnReceivedPayment();
         //更新订单数据
-        receivedPayment=receivedPayment.add(price);
-        unReceivedPayment=unReceivedPayment.subtract(price);
+        receivedPayment=receivedPayment.add(new BigDecimal(money));
+        unReceivedPayment=unReceivedPayment.subtract(new BigDecimal(money));
         salesOrder.setReceivedPayment(receivedPayment);
         salesOrder.setUnReceivedPayment(unReceivedPayment);
         if(money>0){