fix

netflix-dao/src/main/java/com/cyksj/model/views/GoodsWholesaleOrderDonView.java

@@ -0,0 +1,73 @@
+package com.cyksj.model.views;
+
+import com.cyksj.model.entity.GoodsWholesaleOrderDon;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: GoodsWholesaleOrderDonView
+ * 创建者: JavaZou
+ * 创建时间:2024/9/3 16:15
+ */
+@Getter
+@Setter
+@SearchBean(tables = "goods_wholesale_order_don go left join goods_don g on g.id = go.goods_id " +
+		" left join goods_don_sku sku on sku.id = go.sku_id")
+public class GoodsWholesaleOrderDonView {
+	@DbField("go.id")
+	private Long orderId;
+
+	/**
+	 * 批发id
+	 */
+	@DbField("go.pid")
+	private Long pid;
+
+	@DbField("go.order_no")
+	private String orderNo;
+
+	@DbField("go.transaction_id")
+	private String transactionId;
+
+	@DbField("go.money")
+	private BigDecimal money;
+
+	@DbField("go.num")
+	private Integer num;
+
+	@DbField("go.type")
+	private GoodsWholesaleOrderDon.Type type;
+
+	@DbField("go.user_id")
+	private Long userId;
+
+	@DbField("go.goods_id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String title;
+
+	@DbField("go.sku_id")
+	private Long skuId;
+
+	@DbField("sku.spec_val")
+	private String specVal;
+
+	@DbField("go.balance")
+	private BigDecimal balance;
+
+	@DbField("go.status")
+	private GoodsWholesaleOrderDon.Status status;
+
+	@DbField("go.pay_time")
+	private Date payTime;
+
+	@DbField("go.created_time")
+	private Date createdTime;
+}

netflix-web/src/main/java/com/cyksj/web/controller/wholesale/GoodsWholesaleWebController.java

@@ -14,16 +14,20 @@ import com.cyksj.mapper.GoodsWholesaleUserRequirementRecordMapper;
 import com.cyksj.model.GoodsWholesaleUserRequirementRecord;
 import com.cyksj.model.dto.AliPayParams;
 import com.cyksj.model.entity.GoodsWholesaleOrderDon;
+import com.cyksj.model.entity.GoodsWholesaleUserAccount;
 import com.cyksj.model.entity.GoodsWholesaleUserDeposit;
 import com.cyksj.model.request.AlipayOrderDonReq;
 import com.cyksj.model.request.GoodsWholesaleOrderPayReq;
 import com.cyksj.model.response.AliPayTradeStatus;
 import com.cyksj.model.views.GoodsWholesaleFrontView;
+import com.cyksj.model.views.GoodsWholesaleOrderDonView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.order.GoodsWholesalePayService;
 import com.cyksj.service.user.UserBindRelationService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -233,6 +237,33 @@ public class GoodsWholesaleWebController {
 		return "success";
 	}
 
+	/**
+	 * 批发订单列表
+	 */
+	@GetMapping("/get/orders")
+	public Result<SearchResult<GoodsWholesaleOrderDonView>> getOrders() {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		SearchResult<GoodsWholesaleOrderDonView> search = beanSearcher.search(GoodsWholesaleOrderDonView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(GoodsWholesaleOrderDonView::getUserId, userIdList).op(Operator.InList)
+				.orderBy(GoodsWholesaleOrderDonView::getCreatedTime).desc().build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
+	/**
+	 * 订单对应账号列表
+	 */
+	@GetMapping("/get/order/account/{orderId}")
+	public Result<SearchResult<GoodsWholesaleUserAccount> > getOrderAccount(@PathVariable Long orderId) {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		SearchResult<GoodsWholesaleUserAccount> search = beanSearcher.search(GoodsWholesaleUserAccount.class, MapUtils.flatBuilder(request.getParameterMap())
+				.field(GoodsWholesaleUserAccount::getUserId, userIdList).op(Operator.InList)
+				.field(GoodsWholesaleUserAccount::getOrderId, orderId)
+				.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
 
 	/**
 	 * 获取支付宝回调参数