fix

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

@@ -0,0 +1,23 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: GoodsWholesaleFrontOrderView
+ * 创建者: JavaZou
+ * 创建时间:2024/9/11 15:27
+ */
+@Getter
+@Setter
+@SearchBean(tables = "(select distinct goods_id from goods_wholesale_order_don :uid:) gw left join goods_don g on g.id = gw.goods_id")
+public class GoodsWholesaleFrontOrderView {
+	@DbField("gw.goods_id")
+	private Long goodsId;
+
+	@DbField("g.title")
+	private String title;
+}

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

@@ -35,4 +35,10 @@ public class WholeGoodsSkuPayUserDetailView extends BaseEntity {
 
 	@DbField("g.title")
 	private String title;
+
+	@DbIgnore
+	private Integer goal;
+
+	@DbIgnore
+	private Boolean isReturn;
 }

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

@@ -1,21 +1,21 @@
 package com.cyksj.web.controller.wholesale;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.cyksj.common.util.Jsons;
 import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.GoodsWholesaleMapper;
 import com.cyksj.mapper.GoodsWholesaleOrderDonMapper;
 import com.cyksj.mapper.GoodsWholesaleUserDepositMapper;
 import com.cyksj.mapper.GoodsWholesaleUserReturnRecordMapper;
 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.entity.GoodsWholesaleUserReturnRecord;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.request.AlipayOrderDonReq;
 import com.cyksj.model.request.GoodsWholesaleOrderPayReq;
 import com.cyksj.model.response.AliPayTradeStatus;
+import com.cyksj.model.views.GoodsWholesaleFrontOrderView;
 import com.cyksj.model.views.GoodsWholesaleFrontView;
 import com.cyksj.model.views.GoodsWholesaleOrderDonView;
 import com.cyksj.model.views.WholeGoodsSkuPayUserDetailView;
@@ -33,10 +33,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * server/批发下单
@@ -64,7 +62,7 @@ public class GoodsWholesaleWebController {
 
 	private final GoodsWholesalePayService goodsWholesalePayService;
 
-	private final GoodsWholesaleOrderDonMapper goodsWholesaleOrderDonMapper;
+	private final GoodsWholesaleMapper goodsWholesaleMapper;
 
 	private final GoodsWholesaleUserReturnRecordMapper returnRecordMapper;
 
@@ -117,9 +115,35 @@ public class GoodsWholesaleWebController {
 				.field(WholeGoodsSkuPayUserDetailView::getUserId, userIdList).op(Operator.InList)
 				.build());
 		wholeGoodsSkuPayUserDetailView.setTotal(orderDonMapper.getUserWholesaleNumByUserIds(userIdList, wholeGoodsSkuPayUserDetailView.getSkuId()));
+
+		GoodsWholesale goodsWholesale = goodsWholesaleMapper.selectOne(Wrappers.lambdaQuery(GoodsWholesale.class)
+				.eq(GoodsWholesale::getSkuId, wholeGoodsSkuPayUserDetailView.getSkuId())
+				.eq(GoodsWholesale::getDeleted, 1)
+				.last("limit 1"));
+		wholeGoodsSkuPayUserDetailView.setIsReturn(goodsWholesale.getIsReturn());
+		if (goodsWholesale != null && goodsWholesale.getIsReturn()) {
+			String configStr = goodsWholesale.getConfig();
+			List<GoodsWholesale.GoodsWholesaleConfig> configs = null;
+			try {
+				configs = Jsons.parseList(configStr, GoodsWholesale.GoodsWholesaleConfig.class);
+				GoodsWholesale.GoodsWholesaleConfig endConfig = configs.get(configs.size() - 1);
+				wholeGoodsSkuPayUserDetailView.setGoal(endConfig.getStart());
+			} catch (Exception e) {
+			}
+		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(wholeGoodsSkuPayUserDetailView);
 	}
 
+	@GetMapping("/get/order/goods")
+	public Result<List<GoodsWholesaleFrontOrderView>> getWholesaleOrderGoodsList() {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		String userIds = userIdList.stream().map(id -> id.toString()).collect(Collectors.joining(","));
+		List<GoodsWholesaleFrontOrderView> goodsWholesaleFrontOrderViews = beanSearcher.searchAll(GoodsWholesaleFrontOrderView.class, MapUtils.flatBuilder(request.getParameterMap())
+				.put("uid", String.format("where user_id in (%s)", userIds)).build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(goodsWholesaleFrontOrderViews);
+	}
+
 	/**
 	 * 支付押金
 	 */