Browse Source

变更发起异常处理

anderx 9 months ago
parent
commit
f0498943ac

+ 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(@Param("orderNo")String orderNo, @Param("type")Integer type);
+    String selectEstimateCost(@Param("orderNo")String orderNo);
 
     List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
 

+ 11 - 7
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -2183,14 +2183,18 @@
         select ifnull(sum(a.commodity_quantity * ifnull(b.price,0)),0)   from t_order_task a
                                                                                   left join business_project b on a.commodity_id=b.id
         where order_no= #{orderNo}
-        group by
-        <if test="type ==0">
-            consultant_id
-        </if>
-        <if test="type ==1">
-            manager_id
-        </if>
     </select>
+        <select id="listNameByDepAndName" resultType="java.lang.String">
+            select
+            group by
+            <if test="type ==0">
+                consultant_id
+            </if>
+            <if test="type ==1">
+                manager_id
+            </if>
+        </select>
+
 
     <select id="splitProjectList" resultType="com.goafanti.order.bo.TOrderTaskListBo">
         select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,d.contact_mobile receiverMobile,

+ 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(),null));
+		BigDecimal estimateCost=new BigDecimal(tOrderTaskMapper.selectEstimateCost(t.getOrderNo()));
 		t.setEstimateCost(estimateCost);
 		t.setEstimateRefundable(paymentAmount.subtract(estimateCost));
 		t.setZxsRemarks(startRemarks);