会员统计信息修改

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/MemberOrderStatisticsBo.java

@@ -12,21 +12,8 @@ import java.math.BigDecimal;
  */
 @Data
 public class MemberOrderStatisticsBo {
+    //0为全部，其他为会员等级
+    private Integer type;
     private Integer orderNum;
     private BigDecimal totalAmount;
-    /**
-     * 钻石
-     */
-    private Integer diamondOrderNum;
-    private BigDecimal totalDiamondAmount;
-    /**
-     * 黄金
-     */
-    private Integer goldOrderNum;
-    private BigDecimal totalGoldAmount;
-    /**
-     * 普通
-     */
-    private Integer generalOrderNum;
-    private BigDecimal totalGeneralAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/MemberOrderPageVo.java

@@ -5,6 +5,8 @@ import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderStatisticsBo;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author libin
  * @version 1.0
@@ -13,6 +15,6 @@ import lombok.Data;
  */
 @Data
 public class MemberOrderPageVo {
-      private MemberOrderStatisticsBo memberOrderStatisticsBo;
+      private List<MemberOrderStatisticsBo> memberOrderStatisticsBo;
       private PageDataVO<MemberOrderBo>  memberOrderPage;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderMemberDetailBiz.java

@@ -70,7 +70,7 @@ public class OrderMemberDetailBiz extends BaseBiz<OrderMemberDetailMapper,OrderM
 			List<BaseUserMemberLevel> baseUserMemberLevelList = userFeign.levels();
 			if (baseUserMemberLevelList != null && baseUserMemberLevelList.size() > 0) {
 				BaseOrder baseOrder = new BaseOrder();
-				AtomicReference<BaseUserMemberLevel> currentLevel = null;
+				AtomicReference<BaseUserMemberLevel> currentLevel = new AtomicReference<>();
 				baseUserMemberLevelList.parallelStream().forEach(baseUserMemberLevel -> {
 					if (dto.getMemberLevel().equals(baseUserMemberLevel.getLevel())) {
 						currentLevel.set(baseUserMemberLevel);
@@ -95,6 +95,7 @@ public class OrderMemberDetailBiz extends BaseBiz<OrderMemberDetailMapper,OrderM
 					baseOrder.setOrderOrigin(3);
 					baseOrder.setCrtUser(userDTO.getUsername());
 					baseOrder.setCrtName(userDTO.getName());
+					baseOrder.setVersion(1);
 					baseOrderBiz.insertSelectiveRe(baseOrder);
 					OrderMemberDetail orderMemberDetail = new OrderMemberDetail();
 					orderMemberDetail.setOrderId(baseOrder.getId());