调整明细输出格式

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -191,8 +191,8 @@ public class AccountCloseServiceImpl implements AccountCloseService {
 
         // list
         List<UserAccountBill> uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit);
-        BigDecimal income = new BigDecimal(0); // 收入
-        BigDecimal disburse = new BigDecimal(0); //支出
+        BigDecimal income = new BigDecimal(0.00); // 收入
+        BigDecimal disburse = new BigDecimal(0.00); //支出
 
         List retlist =new ArrayList();
         for(UserAccountBill uac:uacblist){
@@ -200,7 +200,6 @@ public class AccountCloseServiceImpl implements AccountCloseService {
             Map odumap =new HashMap();
             OrderUser orderUser = orderUserMapper.getUserOrder(uac.getBatchcode(),uac.getUserIsli());
             odumap.put("order_user",orderUser);
-            retlist.add(odumap);
 
             //结算情况
             Order order = orderMapper.getOrderByBatchcode(uac.getBatchcode());
@@ -234,9 +233,10 @@ public class AccountCloseServiceImpl implements AccountCloseService {
 
             //计算收支
             Map osmap = new HashMap();
-            osmap.put("wherestr","buy_islicode="+uac.getUserIsli()+" and pay_status=2");
+            osmap.put("wherestr","buy_islicode='"+uac.getUserIsli()+"'  and pay_status=2");
             osmap.put("field","total_money");
-            income = orderMapper.sumOrderByMap(osmap);
+            BigDecimal odtmpsum = orderMapper.sumOrderByMap(osmap);
+            income = income.add(odtmpsum);
 
             //
             retlist.add(odumap);
@@ -244,7 +244,7 @@ public class AccountCloseServiceImpl implements AccountCloseService {
 
         retmap.put("income",income);
         retmap.put("disburse",disburse);
-        retmap.put("data",uacblist);
+        retmap.put("data",retlist);
         return retmap;
     }
 }

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -91,7 +91,7 @@
     </select>
 
     <!-- 条件订单总额 -->
-    <select id="sumOrderByMap" parameterType="java.util.Map" resultType="java.lang.Double">
+    <select id="sumOrderByMap" parameterType="java.util.Map" resultType="java.math.BigDecimal">
         select sum(#{cmap.field}) from
         <include refid="tbName"/>
         where ${cmap.wherestr};

src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java

@@ -101,8 +101,8 @@ public class OrderMapperTest {
 
     @Test
     public void mapSumTest(){
-        String starttime ="2022-05-18 00:00:00";
-        String endtime="2022-05-18 23:59:59";
+        String starttime ="'2022-05-18 00:00:00'";
+        String endtime="'2022-05-18 23:59:59'";
         String swhere ="(paymenttime between "+starttime+" and "+endtime+") " +
                 "and pay_status=2";
         Map xmap =new HashMap();