文明积分

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

@@ -97,8 +97,12 @@ public class Order extends BaseEntity {
     private Integer pointStation;
     @ApiModelProperty(value = "积分发放数")
     private Long pointGrant;
+    @ApiModelProperty(value = "文明积分发放数")
+    private Long pointGrantWm;
     @ApiModelProperty(value = "积分兑换数")
     private Long pointExchange;
+    @ApiModelProperty(value = "文明积分兑换数")
+    private Long pointExchangeWm;
     @ApiModelProperty(value = "积分会员统计")
     private String memberListData;
     @ApiModelProperty(value = "积分商户统计")
@@ -109,6 +113,8 @@ public class Order extends BaseEntity {
     private String goodsData2;
     @ApiModelProperty(value = "月度积分统计")
     private String pointMonthData;
+    @ApiModelProperty(value = "月度文明积分统计")
+    private String pointMonthDataWm;
     @ApiModelProperty(value = "交易次数统计")
     private String pointCountData;
     @ApiModelProperty(value = "积分商品个数统计")

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

@@ -1370,18 +1370,32 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
                 if(subsidyCustomerFace.getGrantNum() != null){
                     order.setPointGrant(subsidyCustomerFace.getGrantNum());
                 }
+                if(order.getPointGrantWm() == null){
+                    order.setPointGrantWm(0L);
+                }
+                if(subsidyCustomerFace.getGrantNumWm() != null){
+                    order.setPointGrantWm(subsidyCustomerFace.getGrantNumWm());
+                }
                 if(order.getPointExchange() == null){
                     order.setPointExchange(0L);
                 }
                 if(subsidyCustomerFace.getExchangeNum() != null){
                     order.setPointExchange(subsidyCustomerFace.getExchangeNum());
                 }
+                if(order.getPointExchangeWm() == null){
+                    order.setPointExchangeWm(0L);
+                }
+                if(subsidyCustomerFace.getExchangeNumWm() != null){
+                    order.setPointExchangeWm(subsidyCustomerFace.getExchangeNumWm());
+                }
 
                 order.setPointGoodsData2(JSONObject.toJSONString(subsidyCustomerFace.getPointGoodsData2()));
 
                 order.setPointCountData(JSONObject.toJSONString(subsidyCustomerFace.getPointCountData()));
 
                 order.setPointMonthData(JSONObject.toJSONString(subsidyCustomerFace.getPointMonthData()));
+
+                order.setPointMonthDataWm(JSONObject.toJSONString(subsidyCustomerFace.getPointMonthDataWm()));
             }
         }
     }