银龄积分

src/main/java/com/poteviohealth/cgp/statistics/model/Order.java

@@ -99,6 +99,8 @@ public class Order extends BaseEntity {
     private Long pointGrant;
     @ApiModelProperty(value = "文明积分发放数")
     private Long pointGrantWm;
+    @ApiModelProperty(value = "银龄积分发放数")
+    private Long pointGrantYl;
     @ApiModelProperty(value = "积分兑换数")
     private Long pointExchange;
     @ApiModelProperty(value = "文明积分兑换数")
@@ -115,6 +117,8 @@ public class Order extends BaseEntity {
     private String pointMonthData;
     @ApiModelProperty(value = "月度文明积分统计")
     private String pointMonthDataWm;
+    @ApiModelProperty(value = "月度银龄积分统计")
+    private String pointMonthDataYl;
     @ApiModelProperty(value = "交易次数统计")
     private String pointCountData;
     @ApiModelProperty(value = "积分商品个数统计")

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

@@ -1278,6 +1278,8 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
 
             Long grantWmSum = dataList.stream().filter(t -> t.getTransType().equals("0") && t.getRemark().contains("文明积分")).mapToLong(t -> t.getAmount()).sum();
             face.setGrantNumWm(grantWmSum);
+            Long grantYlSum = dataList.stream().filter(t -> t.getTransType().equals("0") && t.getRemark().contains("银龄积分")).mapToLong(t -> t.getAmount()).sum();
+            face.setGrantNumYl(grantYlSum);
             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();
@@ -1304,6 +1306,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
             }
             face.setPointMonthData(addMonth(dataList, 0,""));
             face.setPointMonthDataWm(addMonth(dataList, 0,"文明积分"));
+            face.setPointMonthDataYl(addMonth(dataList, 0,"银龄积分"));
             face.setPointCountData(addMonth(dataList, 1,""));
             returnList.add(face);
         }
@@ -1376,6 +1379,12 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                 if(subsidyCustomerFace.getGrantNumWm() != null){
                     order.setPointGrantWm(subsidyCustomerFace.getGrantNumWm());
                 }
+                if(order.getPointGrantYl() == null){
+                    order.setPointGrantYl(0L);
+                }
+                if(subsidyCustomerFace.getGrantNumYl() != null){
+                    order.setPointGrantYl(subsidyCustomerFace.getGrantNumYl());
+                }
                 if(order.getPointExchange() == null){
                     order.setPointExchange(0L);
                 }
@@ -1396,6 +1405,8 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                 order.setPointMonthData(JSONObject.toJSONString(subsidyCustomerFace.getPointMonthData()));
 
                 order.setPointMonthDataWm(JSONObject.toJSONString(subsidyCustomerFace.getPointMonthDataWm()));
+
+                order.setPointMonthDataYl(JSONObject.toJSONString(subsidyCustomerFace.getPointMonthDataYl()));
             }
         }
     }