|
|
@@ -20,13 +20,13 @@ import java.util.Date;
|
|
|
@Getter
|
|
|
@Setter
|
|
|
@SearchBean(tables = "distribute_waiting_send_points dw left join order_don od on od.id = dw.order_id and dw.is_vip = false" +
|
|
|
- " left join vip_order_don vod on vod.id = dw.oder_id and dw.is_vip = true" +
|
|
|
+ " left join vip_order_don vod on vod.id = dw.order_id and dw.is_vip = true" +
|
|
|
" left join user u on u.id = od.user_id ")
|
|
|
public class DistributePopularizeOrdersView {
|
|
|
@DbField("ifnull(od.id,dw.order_id)")
|
|
|
private Long orderId;
|
|
|
|
|
|
- @DbField("ifnull(od.goods_id,dw.goods_id)")
|
|
|
+ @DbField("ifnull(od.goods_id,vod.goods_id)")
|
|
|
@JsonIgnore
|
|
|
private Long goodsId;
|
|
|
|
|
|
@@ -34,7 +34,7 @@ public class DistributePopularizeOrdersView {
|
|
|
@JsonIgnore
|
|
|
private Long skuId;
|
|
|
|
|
|
- @DbField("cast(sum(if(od.id is null,vod.money,if(od.is_dp and od.ori_money != 0,od.ori_money,od.money))/100 as decimal(10,2)))")
|
|
|
+ @DbField("if(od.id is null,vod.money,if(od.is_dp and od.ori_money != 0,od.ori_money,od.money))")
|
|
|
private BigDecimal money;
|
|
|
|
|
|
@DbField("dw.shared_id")
|