会员统计信息修改

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/MemberShareRecordDto.java

@@ -12,4 +12,8 @@ import lombok.Data;
 @Data
 public class MemberShareRecordDto extends PageParam {
 	Integer userId;
+	Integer type;
+	Integer level;
+	String startDate;
+	String endDate;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/MemberShareRecordVo.java

+package com.github.wxiaoqi.security.admin.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName : MemberShareRecordVo
+ * @Description : 会员记录统计
+ * @Author : jiaoruizhen
+ * @Date: 2020-11-12 14:04
+ */
+@Data
+public class MemberShareRecordVo {
+	private String date;
+
+	private String levelName;
+
+	private Integer level;
+
+	private Integer userNum;
+
+	private BigDecimal totalAmount;
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/MemberShareRecordController.java

@@ -46,4 +46,19 @@ public class MemberShareRecordController extends BaseController<MemberShareRecor
 		return ObjectRestResponse.succ();
 	}
 
+	@GetMapping(value = "getAllCountRecord")
+	public ObjectRestResponse getAllCountRecord(MemberShareRecordDto memberShareRecordDto) {
+		return baseBiz.getAllCountRecord(memberShareRecordDto);
+	}
+
+	@GetMapping(value = "exportCountRecordList")
+	public ObjectRestResponse exportCountRecordList(HttpServletResponse response, MemberShareRecordDto memberShareRecordDto) {
+		try {
+			baseBiz.exportCountRecordList(response, memberShareRecordDto);
+		} catch (Exception e) {
+			log.error("{}", e);
+			return ObjectRestResponse.createDefaultFail();
+		}
+		return ObjectRestResponse.succ();
+	}
 }
\ No newline at end of file

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

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -96,6 +97,7 @@ public class OrderMemberDetailBiz extends BaseBiz<OrderMemberDetailMapper,OrderM
 					baseOrder.setCrtUser(userDTO.getUsername());
 					baseOrder.setCrtName(userDTO.getName());
 					baseOrder.setVersion(1);
+					baseOrder.setCrtTime(new Date(baseOrder.getPayTime()));
 					baseOrderBiz.insertSelectiveRe(baseOrder);
 					OrderMemberDetail orderMemberDetail = new OrderMemberDetail();
 					orderMemberDetail.setOrderId(baseOrder.getId());