修改多国家上传逻辑

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignServiceImpl.java

@@ -148,9 +148,13 @@ public class MarketingCampaignServiceImpl
                 vo.setOpenedCustomerCount(toInt(openedMap.get(id)));
                 vo.setRepliedCustomerCount(toInt(repliedMap.get(id)));
                 vo.setProtectWhitelistCount(toInt(protectMap.get(id)));
-                vo.setPendingEmailCount(toInt(pendingMap.get(id)));
-                vo.setSentEmailCount(toInt(sentMap.get(id)));
-                vo.setCancelledEmailCount(toInt(cancelledMap.get(id)));
+                int pending = toInt(pendingMap.get(id));
+                int sent = toInt(sentMap.get(id));
+                int cancelled = toInt(cancelledMap.get(id));
+                vo.setPendingEmailCount(pending);
+                vo.setSentEmailCount(sent);
+                vo.setCancelledEmailCount(cancelled);
+                vo.setEmailCountStats(pending + sent + cancelled);
                 int sentCustomer = toInt(sentCustomerMap.get(id));
                 vo.setSentCustomerCount(sentCustomer);
                 vo.setOpenRateText(buildRate(toInt(openedMap.get(id)), sentCustomer));

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketingCampaignVO.java

@@ -176,6 +176,9 @@ public class MarketingCampaignVO extends SysBaseField {
     @ApiModelProperty(value = "统计：已取消邮件数（status=-3）")
     private Integer cancelledEmailCount;
 
+    @ApiModelProperty(value = "统计：邮件数统计（待发送+已发送+已取消 总数）")
+    private Integer emailCountStats;
+
     @ApiModelProperty(value = "统计：已发送客户数（去重 customer_id, status=1）")
     private Integer sentCustomerCount;