Bladeren bron

Merge branch 'test' of jishutao/kede-server into prod

anderx 6 jaren geleden
bovenliggende
commit
0aa87b1818

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

@@ -91,4 +91,5 @@ public interface TOrderBillNewMapper {
 	List<BillBo> selectByOrderNo(String orderNo);
 
 	void insertBatch(List<TOrderBillNew> listBull);
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderNewExample;
 import com.goafanti.order.bo.OrderListBo;
@@ -94,5 +95,6 @@ public interface TOrderNewMapper {
 	int updateFinance(@Param("aid")String aid, @Param("orderNo")String orderNo, @Param("newFinance")String newFinance);
 	int checkContractNo(String sno);
 	Map<String, Object> countTotalAndActually(OrderListBo o);
+	TOrderBillNew getLastPayment(String orderNo);
 
 }

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

@@ -97,5 +97,5 @@ public interface TemporaryReceivablesMapper {
 	String  getCountlistReceivablesAmount(Map<String, Object> parameter);
 
 	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
-	
+
 }

+ 10 - 5
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1079,19 +1079,18 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-  select
+  	select
 	o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
 	o.process_status as processStatus, ifnull(b.amount, 0) as actuallyTotalAmount, o.contract_no as contractNo,
 	o.approval, a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus ,
 	o.first_amount as signFirstPayment, o.total_amount as signTotalAmount, date_format(o.create_time, '%Y-%m-%d %H:%i:%s') as createTime,
 	e.name as outsourceName, 0 as companyId, "湖南科德信息咨询有限公司" as companyName, d.name as departmentName, 
-	f.transaction_amount finalReceivables , date_format(f.maxTime, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount from t_order_new o 
+	f.transaction_amount finalReceivables , date_format(f.create_time, '%Y-%m-%d %H:%i:%s')finalReceivablesTime, g.invoiceAmount from t_order_new o 
 left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join admin a on 	o.salesman_id = a.id 
 left join ( select sum(transaction_amount) as amount , order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no 
 left join ( select order_no, max(name) as name from outsource_organization group by order_no) e on o.order_no = e.order_no
-left join (select 	x.order_no, max(y.maxTime) maxTime, max(x.transaction_amount)transaction_amount
-	from t_order_bill_new x left join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y on
-	x.order_no = y.order_no and x.create_time = y.maxTime group by x.order_no) f on o.order_no = f.order_no
+left join (select x.order_no,x.create_time,x.transaction_amount from t_order_bill_new x right join (select order_no, max(create_time) maxTime from t_order_bill_new group by order_no)y
+	on  x.order_no=y.order_no and x.create_time=y.maxTime LIMIT 1) f on o.order_no = f.order_no
 left join ( select order_no , sum(amount) invoiceAmount from t_order_invoice where status = 2 group by order_no ) g on o.order_no = g.order_no
 where delete_sign != 1 and outsource=  #{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
@@ -1544,4 +1543,10 @@ where super_id is null ) e on e.order_no=a.order_no
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>									
 	  	</select>	
+	  	
+	  	<select id="getLastPayment" resultType="com.goafanti.common.model.TOrderBillNew">
+  	select date_format(create_time, '%Y-%m-%d %H:%i:%s') createTimes,transaction_amount transactionAmount from t_order_bill_new
+	where order_no= #{orderNo}
+	order by create_time desc limit 1;
+  </select>
 </mapper>

+ 6 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -154,6 +154,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
+		/*List<OrderListBo> list=(List<OrderListBo>) data.getList();
+		for (OrderListBo ob : list) {
+			TOrderBillNew lp=tOrderNewMapper.getLastPayment(ob.getOrderNo());
+			ob.setFinalReceivables(lp.getTransactionAmount().toString());
+			ob.setFinalReceivablesTime(lp.getCreateTimes());
+		}*/
 		result.put("pagination", data);
 		Map<String, Object> count = tOrderNewMapper.countTotalAndActually(order);
 		result.put("count", count);

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

@@ -298,7 +298,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(StringUtils.isNotBlank(orderDepId))parameter.put("orderDepId", orderDepId);
 		if(null!=status)parameter.put("status", status);
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
-		return (Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
+		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
+		return p;
 	}
 	
 	@Override