anderx 6 years ago
parent
commit
f9c7c5ca3a

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

@@ -91,4 +91,6 @@ public interface TOrderBillNewMapper {
 	List<BillBo> selectByOrderNo(String orderNo);
 
 	void insertBatch(List<TOrderBillNew> listBull);
+
+	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);
-	
+
 }

+ 5 - 0
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -652,4 +652,9 @@ where order_no= #{orderNo,jdbcType=VARCHAR};
       #{item.type,jdbcType=INTEGER})
     </foreach>
   </insert>
+  <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=billNewMapper.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