anderx месяцев назад: 9
Родитель
Сommit
91ee5e0c0c

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -100,7 +100,7 @@ public interface TOrderTaskMapper {
 
     void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
 
-    String selectEstimateCost(String orderNo);
+    String selectEstimateCost(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
     List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -110,7 +110,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		BigDecimal paymentAmount=tOrderBillNewMapper.conutAmountByOrderNo(t.getOrderNo());
 		t.setPaymentAmount(paymentAmount);//收款金额
 		//预计成本与预计退款:预计成本=项目价格*数量    预计退款=收款-预计成本
-		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
+		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo(),null));
 		t.setEstimateCost(estimateCost);
 		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
 		t.setZxsRemarks(startRemarks);