fix

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

@@ -0,0 +1,54 @@
+package com.cyksj.model.views;
+
+import com.cyksj.model.entity.OrderDon;
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: YhShopRegisterDistributeOrdersDetailView
+ * 创建者: JavaZou
+ * 创建时间:2023/9/28 18:04
+ */
+@Getter
+@Setter
+@SearchBean(tables = "order_don od left join goods_don gd on gd.id = od.goods_id" +
+		" left join yh_shop ys on ys.id = od.yhs_id",
+		where = ":condition:")
+public class YhShopRegisterDistributeOrdersDetailView {
+	@DbField("od.created_time")
+	private Date createdTime;
+
+	@DbField("od.money")
+	private BigDecimal money;
+
+	@DbField("od.status")
+	private OrderDon.Status status;
+
+	@DbField("ys.user_id")
+	private Long shopUserId;
+
+	@DbField("od.user_id")
+	private Long userId;
+
+	@DbIgnore
+	private String nickname;
+
+	@DbField("gd.id")
+	private Long goodsId;
+
+	@DbField("gd.title")
+	private String platform;
+
+	@DbField("od.sku_id")
+	private Long skuId;
+
+	@DbIgnore
+	private String specVal;
+}

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

@@ -18,7 +18,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(select * from order_don :condition:) od left join goods_don g on g.id = od.goods_id left join goods_don_sku sku on sku.id = od.sku_id")
+@SearchBean(tables = "(select o.* from order_don o left join yh_shop ys on ys.id = o.yhs_id :condition:) od left join goods_don g on g.id = od.goods_id left join goods_don_sku sku on sku.id = od.sku_id")
 public class YhShopRegisterOrderDetail {
 	@DbField("od.created_time")
 	private Date createdTime;
@@ -35,10 +35,10 @@ public class YhShopRegisterOrderDetail {
 	@DbIgnore
 	private String nickname;
 
-	@DbField("gd.id")
+	@DbField("g.id")
 	private Long goodsId;
 
-	@DbField("gd.title")
+	@DbField("g.title")
 	private String platform;
 
 	@DbField("od.sku_id")

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/shop/CmsYhShopGoodsController.java

@@ -272,14 +272,17 @@ public class CmsYhShopGoodsController {
                 .field(YhShopRegisterDetail::getShopUserId, shopUserId)
                 .build());
         search.getDataList().forEach(data -> {
-            List<RegisterDistributeOrdersDetailView> ordersDetailViewList = beanSearcher.searchAll(RegisterDistributeOrdersDetailView.class, MapUtils.builder().field(RegisterDistributeOrdersDetailView::getUserId, data.getUserId()).op(Operator.Equal).build());
+            List<YhShopRegisterDistributeOrdersDetailView> ordersDetailViewList = beanSearcher.searchAll(YhShopRegisterDistributeOrdersDetailView.class, MapUtils.builder()
+                    .field(YhShopRegisterDistributeOrdersDetailView::getShopUserId, shopUserId)
+                    .field(YhShopRegisterDistributeOrdersDetailView::getUserId, data.getUserId())
+                    .build());
             data.setOrderNums(ordersDetailViewList.size());
             Optional<BigDecimal> money = ordersDetailViewList.stream().filter(order -> {
                 if (!Constant.noOrderAllStatus.contains(order.getStatus().name())) {
                     return true;
                 }
                 return false;
-            }).map(RegisterDistributeOrdersDetailView::getMoney).reduce(BigDecimal::add);
+            }).map(YhShopRegisterDistributeOrdersDetailView::getMoney).reduce(BigDecimal::add);
             data.setMoney(money.isPresent() ? money.get() : BigDecimal.ZERO);
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
@@ -288,9 +291,9 @@ public class CmsYhShopGoodsController {
     /**
      * 店铺注册人数 订单详情
      */
-    @GetMapping("/get/register/order/detail/{yhsId}/{userId}")
-    public Result<SearchResult<YhShopRegisterOrderDetail>> getRegisterOrderDetail(@PathVariable Long yhsId, @PathVariable Long userId) {
-        String condition = String.format("where yhs_id = %s and user_id = %s", yhsId, userId);
+    @GetMapping("/get/register/order/detail/{shopUserId}/{userId}")
+    public Result<SearchResult<YhShopRegisterOrderDetail>> getRegisterOrderDetail(@PathVariable Long shopUserId, @PathVariable Long userId) {
+        String condition = String.format("where ys.user_id = %s and o.user_id = %s", shopUserId, userId);
         SearchResult<YhShopRegisterOrderDetail> search = beanSearcher.search(YhShopRegisterOrderDetail.class, MapUtils.flatBuilder(request.getParameterMap())
                 .put("condition", condition)
                 .build());