fix

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

@@ -0,0 +1,38 @@
+package com.cyksj.model.views;
+
+import com.cyksj.model.entity.BaseEntity;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: WholeGoodsSkuPayUserDetailView
+ * 创建者: JavaZou
+ * 创建时间:2024/9/11 11:53
+ */
+@Getter
+@Setter
+@SearchBean(tables = "(select id,sku_id,goods_id,user_id from goods_wholesale_order_don :oid:) o left join goods_don g on g.id = o.goods_id" +
+		" left join goods_don_sku sku on sku.id = o.sku_id")
+public class WholeGoodsSkuPayUserDetailView extends BaseEntity {
+	@DbIgnore
+	private Integer total;
+
+	@DbField("o.user_id")
+	private Long userId;
+
+	@DbField("o.sku_id")
+	private Long skuId;
+
+	@DbField("sku.spec_val")
+	private String specVal;
+
+	@DbField("o.goods_id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String title;
+}

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

@@ -18,6 +18,7 @@ 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.model.views.WholeGoodsSkuPayUserDetailView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.order.GoodsWholesalePayService;
 import com.cyksj.service.user.UserBindRelationService;
@@ -104,6 +105,21 @@ public class GoodsWholesaleWebController {
 		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsWholesaleUserDeposit);
 	}
 
+	/**
+	 * 当前批发规格已购买详情
+	 */
+	@GetMapping("/get/sku/detail")
+	public Result<WholeGoodsSkuPayUserDetailView> getUserPayWholesaleSkuDetail(@RequestParam(required = true) Long orderId) {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		WholeGoodsSkuPayUserDetailView wholeGoodsSkuPayUserDetailView = beanSearcher.searchFirst(WholeGoodsSkuPayUserDetailView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.put("oid", String.format("where id = %s", orderId))
+				.field(WholeGoodsSkuPayUserDetailView::getUserId, userIdList).op(Operator.InList)
+				.build());
+		wholeGoodsSkuPayUserDetailView.setTotal(orderDonMapper.getUserWholesaleNumByUserIds(userIdList, wholeGoodsSkuPayUserDetailView.getSkuId()));
+		return GatewayResponse.SUCCESS.newBuilder().toResult(wholeGoodsSkuPayUserDetailView);
+	}
+
 	/**
 	 * 支付押金
 	 */
@@ -234,14 +250,16 @@ public class GoodsWholesaleWebController {
 	 * 是否已返差价
 	 */
 	@GetMapping("/return/differ")
-	public Result<Boolean> returnDiffer(@RequestParam(required = true) Long orderId) {
+	public Result<GoodsWholesaleUserReturnRecord> returnDiffer(@RequestParam(required = true) Long orderId) {
 		long userId = StpUserUtil.getLoginIdAsLong();
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
 		GoodsWholesaleOrderDon orderDon = orderDonMapper.selectById(orderId);
-		Integer selectCount = returnRecordMapper.selectCount(Wrappers.lambdaQuery(GoodsWholesaleUserReturnRecord.class)
+		GoodsWholesaleUserReturnRecord returnRecord = returnRecordMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesaleUserReturnRecord.class)
 				.in(GoodsWholesaleUserReturnRecord::getUserId, userIdList)
-				.eq(GoodsWholesaleUserReturnRecord::getSkuId, orderDon.getSkuId()));
-		return GatewayResponse.SUCCESS.newBuilder().toResult(selectCount > 0);
+				.eq(GoodsWholesaleUserReturnRecord::getSkuId, orderDon.getSkuId())
+				.last("limit 1")
+				.select(GoodsWholesaleUserReturnRecord::getReturnBalance, GoodsWholesaleUserReturnRecord::getSkuId, GoodsWholesaleUserReturnRecord::getNum));
+		return GatewayResponse.SUCCESS.newBuilder().toResult(returnRecord);
 	}