调整首页统计结果不准确的问题

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

@@ -83,19 +83,27 @@ public class IndexServiceImpl implements IndexService {
         Map xomap = new HashMap();
         xomap.put("field", "total_service_charge");
         xomap.put("wherestr", swhere);
-        BigDecimal orderMoney = orderMapper.sumOrderByMap(xomap);
-        result.put("order_money", orderMoney == null ? "0.00" : orderMoney);
+        // 总的服务费
+        BigDecimal tscharge = orderMapper.sumOrderByMap(xomap);
+        if(tscharge!=null){
+            tscharge=new BigDecimal("0.00");
+            // 交易总额 - 总的服务费
+            BigDecimal orderMoney = dealMoney.subtract(tscharge).setScale(2);
+            result.put("order_money", orderMoney);
+        }else{
+            result.put("order_money",  "0.00");
+        }
+
 
         //上架数量
         Map xgmap = new HashMap();
-        xgmap.put("goods_status", "1");
         xgmap.put("btwstr", "createtime between " + yesterday_start + " and " + yesterday_end);
         Integer shelfCount = goodsMapper.goodsCount(xgmap);
         result.put("shelf_count", shelfCount == null ? 0 : shelfCount);
 
         //下架数量
         Map ogmap = new HashMap();
-        ogmap.put("goods_status", "2");
+        ogmap.put("goods_status", "4");
         ogmap.put("btwstr", "canceltime between " + yesterday_start + " and " + yesterday_end);
         Integer outCount = goodsMapper.goodsCount(ogmap);
         result.put("out_count", outCount == null ? 0 : outCount);