fix

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

@@ -0,0 +1,40 @@
+package com.cyksj.model.views;
+
+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;
+
+/**
+ * 项目名: yhlxj2
+ * 文件名: UserMirrorShopDsJoinOrderDetailView
+ * 创建者: JavaZou
+ * 创建时间:2024/11/12 10:20
+ */
+@Getter
+@Setter
+@SearchBean(tables = "(select o.id,o.user_id,o.money,o.refund_money,o.created_time from user_mirror_shop_fee_order_don o where :yhs_id: and o.status not in ('close','noPayment') :time:) od" +
+		" inner join user_mirror_shop_distribute_waiting_send_points dp on dp.order_id = od.id and dp.type = 2")
+public class UserMirrorShopDsJoinOrderDetailView {
+
+	@DbField("select nickname from user where id = od.user_id limit 1")
+	private String nickname;
+
+	@DbField("cast(od.money/100 as decimal(10,2))")
+	private BigDecimal money;
+
+	@DbField("TRUNCATE(dp.money/100,2)")
+	private BigDecimal reMoney = BigDecimal.ZERO;
+
+	@DbField("if(send_status = 'success',TRUNCATE(dp.refund_money/100,2),0)")
+	private BigDecimal rdMoney;
+
+	@DbField("dp.send_status")
+	private String sendStatus;
+
+	@DbField("od.created_time")
+	private Date createdTime;
+}

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

@@ -19,7 +19,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "(select o.id,o.user_id,o.goods_id,o.sku_id,o.money,o.refund_money,o.coupon_money,o.created_time from order_don o inner join user_mirror_shop_order_relate uor on uor.order_id = o.id where :yhs_id: and o.status not in ('close','noPayment') :time:) od" +
 		" left join goods_don g on g.id = od.goods_id" +
-		" inner join user_mirror_shop_distribute_waiting_send_points dp on dp.order_id = od.id and :ty:")
+		" inner join user_mirror_shop_distribute_waiting_send_points dp on dp.order_id = od.id and dp.type = 1")
 public class UserMirrorShopDsOrderDetailView {
 
 	@DbField("select nickname from user where id = od.user_id limit 1")

netflix-web/src/main/java/com/cyksj/web/controller/manage/mirrorshop/manage/CmsUserMirrorShopDataController.java

@@ -129,7 +129,7 @@ public class CmsUserMirrorShopDataController {
 	 * 店铺分销订单收入详细
 	 */
 	@GetMapping("/get/distribute/orders/detail/data")
-	public Result<SearchResult<UserMirrorShopDsOrderDetailView>> getUserDistributeOrdersDetailView(@RequestParam(defaultValue = "1") Integer type, Long firstDate, Long lastDate) {
+	public Result<SearchResult> getUserDistributeOrdersDetailView(@RequestParam(defaultValue = "1") Integer type, Long firstDate, Long lastDate) {
 		long yhShopUserId = StpUserMirrorShopManageUser.getLoginIdAsLong();
 		UserMirrorShop yhShop = userMirrorShopMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShop.class)
 				.eq(UserMirrorShop::getUserId, yhShopUserId).last("limit 1"));
@@ -149,13 +149,14 @@ public class CmsUserMirrorShopDataController {
 		if (StrUtil.isNotEmpty(timeSql)) {
 			builder.put("time", timeSql);
 		}
+		SearchResult search;
 		if (type == 1) {
-			builder.put("ty", " dp.type = 1");
+			search = beanSearcher.search(UserMirrorShopDsOrderDetailView.class, builder.build());
+			return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 		} else {
 			//加盟订单提成
-			builder.put("ty", " dp.type = 2");
+			search = beanSearcher.search(UserMirrorShopDsOrderDetailView.class, builder.build());
 		}
-		SearchResult<UserMirrorShopDsOrderDetailView> search = beanSearcher.search(UserMirrorShopDsOrderDetailView.class, builder.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}