Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -188,8 +188,11 @@ public class StatisticsHomepageServiceImpl {
                     for (String e : preparationMoney.keySet()) {
                         if (!e.equals("已收货") &&!e.equals("yshrl")){
                             list.add(MapBuilder.<String, Object>create().put("statusText", e).put("total", preparationMoney.get(e)).build());
+                            preparationNum += new BigDecimal(preparationMoney.get(e).toString()).longValue();
+                        }
+                        if (e.equals("已收货")){
+                            preparationNum += new BigDecimal(preparationMoney.get(e).toString()).longValue();
                         }
-                        preparationNum += new BigDecimal(preparationMoney.get(e).toString()).longValue();
                     }
                     list.add(MapBuilder.<String, Object>create().put("statusText", "已收货").put("total", preparationMoney.get("已收货")).put("realScale", preparationMoney.get("yshrl")).build());
                     list =    this.nullDataBuildResult(list,preparationMoneyKeys);