zoujiajian преди 3 години
родител
ревизия
f1ac9a529b

+ 49 - 0
netflix-dao/src/main/java/com/cyksj/model/views/DistributeOrdersDetailView.java

@@ -0,0 +1,49 @@
+package com.cyksj.model.views;
+
+import com.cyksj.model.entity.DistributeWaitingSendPoints;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/*
+ *项目名: netflix
+ *文件名: DistributeOrdersDetailView
+ *创建者: JavaZou
+ *创建时间:2022/12/12 15:36
+ */
+@Getter
+@Setter
+@SearchBean(tables = "distribute_waiting_send_points dp left join order_don od on od.id = dp.order_id" +
+		" left join user u on u.id = dp.user_id" +
+		" left join goods_don gd on gd.id = od.goods_id")
+public class DistributeOrdersDetailView {
+	@DbField("u.nickname")
+	private String nickname;
+
+	@DbField("u.id")
+	private Long userId;
+
+	@DbField("dp.shared_id")
+	@JsonIgnore
+	private Long sharedId;
+
+	@DbField("gd.title")
+	private String platform;
+
+	@DbField("od.money")
+	private BigDecimal money;
+
+	@DbField("od.created_time")
+	private Date orderTime;
+
+	@DbField("dp.points")
+	private BigDecimal points;
+
+	@DbField("dp.send_status")
+	private DistributeWaitingSendPoints.Status sendStatus;
+}

+ 10 - 4
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -14,10 +14,7 @@ import com.cyksj.mapper.manage.distribute.UserDistributeMapper;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.DistributeApplyMoneyReq;
 import com.cyksj.model.request.UserDistributeReq;
-import com.cyksj.model.views.DistributeMoneyApplyView;
-import com.cyksj.model.views.MoneyApplyView;
-import com.cyksj.model.views.UserDistributeView;
-import com.cyksj.model.views.UserDistributeViews;
+import com.cyksj.model.views.*;
 import com.cyksj.service.distribute.DistributeService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -131,6 +128,15 @@ public class DistributeController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsDonMapper.selectList(Wrappers.lambdaQuery(GoodsDon.class).eq(GoodsDon::getType, 1).eq(GoodsDon::getDeleted, true).orderByAsc(GoodsDon::getId).select(GoodsDon::getId, GoodsDon::getTitle, GoodsDon::getRate)));
 	}
 
+	/**
+	 * 获取推广者分销订单详情
+	 */
+	@GetMapping("/get/distribute/order/detail")
+	public Result<SearchResult<DistributeOrdersDetailView>> getDistributeOrderDetail(HttpServletRequest request) {
+		SearchResult<DistributeOrdersDetailView> search = beanSearcher.search(DistributeOrdersDetailView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
 	/**
 	 * 平台分销比例修改
 	 */