添加文明积分统计

src/main/java/com/poteviohealth/cgp/statistics/model/outdto/IntegralTrans.java

@@ -58,4 +58,7 @@ public class IntegralTrans {
     @ApiModelProperty("街道")
     private Integer streetId;
 
+    @ApiModelProperty("备注")
+    private String remark;
+
 }

src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -1275,6 +1275,11 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             face.setGrantNum(grantSum);
             Long exchangeSum = dataList.stream().filter(t -> t.getTransType().equals("1")).mapToLong(t -> t.getAmount()).sum();
             face.setExchangeNum(exchangeSum);
+
+            Long grantWmSum = dataList.stream().filter(t -> t.getTransType().equals("0") && t.getRemark().contains("文明积分")).mapToLong(t -> t.getAmount()).sum();
+            face.setGrantNumWm(grantWmSum);
+            Long exchangeWmSum = dataList.stream().filter(t -> t.getTransType().equals("1") && t.getRemark().contains("文明积分")).mapToLong(t -> t.getAmount()).sum();
+            face.setExchangeNumWm(exchangeWmSum);
             List<MonthData> goodsList = Lists.newArrayList();
             Map<Integer, List<IntegralTrans>> maps = dataList.stream().filter(i -> i.getParentId() != null).collect(Collectors.groupingBy(IntegralTrans::getParentId));
             for (Integer categoryId : maps.keySet()) {
@@ -1297,13 +1302,14 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             if (!goodsList.isEmpty()) {
                 face.setPointGoodsData2(goodsList);
             }
-            face.setPointMonthData(addMonth(dataList, 0));
-            face.setPointCountData(addMonth(dataList, 1));
+            face.setPointMonthData(addMonth(dataList, 0,""));
+            face.setPointMonthDataWm(addMonth(dataList, 0,"文明积分"));
+            face.setPointCountData(addMonth(dataList, 1,""));
             returnList.add(face);
         }
     }
 
-    private List<MonthData> addMonth(List<IntegralTrans> transList,Integer type){
+    private List<MonthData> addMonth(List<IntegralTrans> transList,Integer type,String remark){
         Date endDate = new Date();
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(endDate));
@@ -1326,10 +1332,14 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                     data.setAddValue(0L);
                     data.setUseValue(0L);
                 }else{
-                    data.setAddValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("0")).mapToLong(c->c.getAmount()).sum());
-                    data.setUseValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("1")).mapToLong(c->c.getAmount()).sum());
+                    if(StringUtils.isNotEmpty(remark)){
+                        data.setAddValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("0") && c.getRemark().contains(remark)).mapToLong(c->c.getAmount()).sum());
+                        data.setUseValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("1") && c.getRemark().contains(remark)).mapToLong(c->c.getAmount()).sum());
+                    }else{
+                        data.setAddValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("0")).mapToLong(c->c.getAmount()).sum());
+                        data.setUseValue(transList.stream().filter(c->c.getBuildTime().after(calendar2.getTime()) && c.getBuildTime().before(com.poteviohealth.cgp.common.utils.DateUtils.getLastDayOfMonth(calendar2.getTime())) && c.getTransType().equals("1")).mapToLong(c->c.getAmount()).sum());
+                    }
                 }
-
             }else {
                 if (transList.isEmpty()) {
                     data.setAddValue(0L);

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

@@ -19,6 +19,7 @@
             g.full_name AS fullName,
             t.trans_type AS transType,
             t.amount AS amount,
+            t.remark as remark,
             t.build_time AS buildTime
         FROM
             ${dbName}_finance.c_card_acc_trans t