From d6691c1325b2bc21688260dff7a8914db4b7f7f6 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 20 Jul 2022 13:08:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E6=94=B6?=
 =?UTF-8?q?=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AccountCloseServiceImpl.java | 32 +++++++++++++++++++
 .../resources/mapper/szwh/OrderMapper.xml     |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
index 25ef158..f5b8cbb 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
@@ -179,6 +179,7 @@ public class AccountCloseServiceImpl implements AccountCloseService {
      */
     @Override
     public Map<String, Object> getBillDetail(String uesrIsli, int ipage, int ilimit) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map retmap =new HashMap();
         int startrs =ipage>1?(ipage-1)*ilimit:0;
         int total = userAccountBillMapper.countUserAccBill(uesrIsli);
@@ -203,8 +204,39 @@ public class AccountCloseServiceImpl implements AccountCloseService {
 
             //结算情况
             Order order = orderMapper.getOrderByBatchcode(uac.getBatchcode());
+            odumap.put("order_createtime", sdf.format(order.getCreatetime()));
+            odumap.put("order_completetime", sdf.format(order.getCompletetime()));
             odumap.put("close_status",order.getCloseStatus());
 
+            //uac 数据进行格式化
+            odumap.put("id",uac.getId());
+            odumap.put("user_isli", uac.getUserIsli());
+            odumap.put("batchcode", uac.getBatchcode());
+            odumap.put("order_user_id", uac.getOrderUserId());
+            odumap.put("center_number", StringUtils.isBlank(uac.getCenterNumber())?"-":uac.getCenterNumber());
+            odumap.put("center_name", StringUtils.isBlank(uac.getCenterName())?"-":uac.getCenterName());
+            odumap.put("service_number", uac.getServiceNumber());
+            odumap.put("service_name", uac.getServiceName());
+            odumap.put("service_charge", uac.getServiceCharge());
+            odumap.put("thatday_buy_money", uac.getThatdayBuyMoney());
+            odumap.put("preliminary_capital", uac.getPreliminaryCapital());
+            odumap.put("available_capital", uac.getAvailableCapital());
+            odumap.put("disburse_capital", uac.getDisburseCapital());
+            odumap.put("entrust_cost", uac.getEntrustCost());
+            odumap.put("thatday_sale_money", uac.getThatdaySaleMoney());
+            odumap.put("service_charge_allot", uac.getServiceChargeAllot());
+            odumap.put("capital_remaining",uac.getCapitalRemaining());
+            odumap.put("freeze_earnest_money", uac.getFreezeEarnestMoney());
+            odumap.put("createtime", sdf.format(uac.getCreatetime()));
+            odumap.put("close_time", null);
+            odumap.put("callback_msg", "-");
+
+            //计算收支
+            Map osmap = new HashMap();
+            osmap.put("wherestr","buy_islicode="+uac.getUserIsli()+" and pay_status=2");
+            osmap.put("field","total_money");
+            income = orderMapper.sumOrderByMap(osmap);
+
             //
             retlist.add(odumap);
         }
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index ff5a573..0b6b257 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -94,7 +94,7 @@
     <select id="sumOrderByMap" parameterType="java.util.Map" resultType="java.lang.Double">
         select sum(#{cmap.field}) from
         <include refid="tbName"/>
-        where #{cmap.wherestr};
+        where ${cmap.wherestr};
     </select>
 
     <!--新增用户-->