From ef99e07e96c6d7736f3d1799195e900f300ed7f3 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Tue, 13 Oct 2020 14:32:24 +0800 Subject: [PATCH] . --- .../src/main/java/com/cowr/ssjygl/prepay/PrepayService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java index 34f5560..0119620 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java @@ -226,6 +226,7 @@ public class PrepayService { " ,a.paid \n" + " ,a.customer_id \n" + " ,a.customer_name \n" + + " ,a.create_time \n" + " from ( \n" + sale_sql + " union \n" + temp_sql + " ) a \n" + @@ -432,7 +433,7 @@ public class PrepayService { */ public List flow(Integer customer_id, String stm, String etm) { String sql = "select * from ( \n" + - " select a.sn id, a.create_time, p.arrive_time tm, 0 - a.total_price amount, '扣费' type, \n" + + " select a.sn id, p.arrive_time tm, 0 - a.total_price amount, '扣费' type, \n" + " case when a.paid > 0 then concat('补差额', a.paid) else '' end memo, a.customer_id, a.customer_name \n" + " from ( \n" + " select t.sn, t.total_price, t.paid, t.customer_id, t.customer_name, t.create_time \n" +