zoujiajian 3 éve
szülő
commit
37d595a917

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

@@ -17,7 +17,7 @@ import java.util.Date;
 @Getter
 @Setter
 @SearchBean(tables = "equipment_user_receive_benefits_record er left join goods_don_sku sku on sku.id = er.sku_id" +
-		" left join goods_don g on g.id = sku.goods_id")
+		" left join goods_don gd on gd.id = sku.goods_id")
 public class EquipmentBenefitsView {
 	@DbField("gd.id")
 	private Long goodsId;
@@ -31,10 +31,10 @@ public class EquipmentBenefitsView {
 	@DbField("gd.type")
 	private Integer type;
 
-	@DbField("gdk.spec_val")
+	@DbField("sku.spec_val")
 	private String specVal;
 
-	@DbField("gdk.price")
+	@DbField("sku.price")
 	private BigDecimal money;
 
 	@DbField("er.user_id")

+ 1 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/EquipmentController.java

@@ -73,7 +73,7 @@ public class EquipmentController {
 						.field(EquipmentUserDistributeDetailView::getShareId, shareId)
 						.build());
 		search.getDataList().forEach(data -> {
-			User user = userMapper.selectById(data.getShareId());
+			User user = userMapper.selectById(data.getUserId());
 			Optional.ofNullable(user).ifPresent(u -> data.setNickname(u.getNickname()));
 			String couponName = couponMapper.getCouponNameByCouponUserId(data.getCouponUserId());
 			data.setCouponName(couponName);