功能补全

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/MemberModel.java

@@ -232,7 +232,7 @@ public class MemberModel {
         //2.2查询bz_order字段
         OrderExample orderExample = new OrderExample();
         orderExample.setMemberId(memberId);
-        orderExample.setOrderStateIn(OrderConst.ORDER_STATE_20 + "," + OrderConst.ORDER_STATE_30 + "," + OrderConst.ORDER_STATE_40);
+        orderExample.setOrderStateIn(OrderConst.ORDER_STATE_0 + "," + OrderConst.ORDER_STATE_20 + "," + OrderConst.ORDER_STATE_30 + "," + OrderConst.ORDER_STATE_40);
         List<Order> orderList = orderModel.getOrderList(orderExample, null);
 
         //客单价
@@ -248,14 +248,19 @@ public class MemberModel {
 
         if (!CollectionUtils.isEmpty(orderList)) {
             for (Order order : orderList) {
-                orderAmount = orderAmount.add(order.getOrderAmount());
-                if (order.getRefundAmount().compareTo(BigDecimal.ZERO) > 0) {
-                    refundAmount = refundAmount.add(order.getRefundAmount());
-                    refundNumber++;
+                // 1.计算累计消费
+                if(order.getOrderState()>0){
+                    orderAmount = orderAmount.add(order.getOrderAmount());
+                    orderNumber++;
+                }
+                // 2.计算累计退款
+                if(order.getOrderState()==0){
+                    if (order.getRefundAmount().compareTo(BigDecimal.ZERO) > 0) {
+                        refundAmount = refundAmount.add(order.getRefundAmount());
+                        refundNumber++;
+                    }
                 }
             }
-            orderNumber = orderList.size();
-            pstPrice = orderAmount.divide(new BigDecimal(orderNumber), 2, BigDecimal.ROUND_HALF_UP);
         }
 
         //3.组装前端响应实体MemberDetailVO