zoujiajian преди 3 години
родител
ревизия
fefa877863

+ 3 - 3
netflix-dao/src/main/java/com/cyksj/model/views/UserDistributeBusinessRateRecordView.java

@@ -14,8 +14,8 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@SearchBean(tables = "goods_don g left join user_distribute_business_rate ur on g.id = ur.goods_id :business_id:" +
-		" left join goods_don_sku gdk on gdk.id = ur.sku_id",
+@SearchBean(tables = "goods_don g left join goods_don_sku gdk on gdk.goods_id = g.id" +
+		" left join user_distribute_business_rate ur on ur.sku_id = gdk.id :business_id:",
 		where = "g.deleted is true and g.status is true")
 public class UserDistributeBusinessRateRecordView {
 	@DbField("ur.id")
@@ -39,7 +39,7 @@ public class UserDistributeBusinessRateRecordView {
 	/**
 	 * 规格id
 	 */
-	@DbField("ur.sku_id")
+	@DbField("gdk.id")
 	private Long skuId;
 
 	@DbField("gdk.spec_val")

+ 4 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -500,7 +500,11 @@ public class DistributeController {
 				.put("business_id", String.format(" and ur.business_id = %s", businessId))
 				.field(UserDistributeBusinessRateRecordView::getType, type)
 				.orderBy(UserDistributeBusinessRateRecordView::getGoodsId).asc()
+				.orderBy(UserDistributeBusinessRateRecordView::getSkuId).asc()
 				.build());
+		userDistributeBusinessRate.forEach(data -> {
+			data.setBusinessId(businessId);
+		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userDistributeBusinessRate);
 	}