|
|
@@ -18,7 +18,7 @@ import java.util.Date;
|
|
|
@Getter
|
|
|
@Setter
|
|
|
@SearchBean(tables = "(select * from distribute_waiting_send_points where :sharedId: :time:) dw left join order_don od on od.id = dw.order_id and dw.is_vip = false and od.status not in ('close','noPayment')" +
|
|
|
- " left join vip_order_don vod on vod.id = dw.oder_id and dw.is_vip = true and vod.status not in ('close','noPayment')" +
|
|
|
+ " left join vip_order_don vod on vod.id = dw.order_id and dw.is_vip = true and vod.status not in ('close','noPayment')" +
|
|
|
" left join goods_don g on g.id = ifnull(od.goods_id,vod.goods_id)"
|
|
|
)
|
|
|
public class UserDistributeOrdersDetailView {
|
|
|
@@ -36,25 +36,25 @@ public class UserDistributeOrdersDetailView {
|
|
|
@DbField("select spec_val from goods_don_sku where id = od.sku_id limit 1")
|
|
|
private String specVal;
|
|
|
|
|
|
- @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))/100")
|
|
|
private BigDecimal money;
|
|
|
|
|
|
@DbField("od.coupon_money")
|
|
|
private BigDecimal couponMoney;
|
|
|
|
|
|
- @DbField("TRUNCATE(dp.points/1000,2)")
|
|
|
+ @DbField("TRUNCATE(dw.points/1000,2)")
|
|
|
private BigDecimal reMoney = BigDecimal.ZERO;
|
|
|
|
|
|
- @DbField("if(send_status = 'success',TRUNCATE(dp.refund_points/1000,2),0)")
|
|
|
+ @DbField("if(send_status = 'success',TRUNCATE(dw.refund_points/1000,2),0)")
|
|
|
private BigDecimal rdMoney;
|
|
|
|
|
|
/**
|
|
|
* 是否参与渠道分销规则
|
|
|
*/
|
|
|
- @DbField("dp.is_rule")
|
|
|
+ @DbField("dw.is_rule")
|
|
|
private Boolean isRule;
|
|
|
|
|
|
- @DbField("dp.send_status")
|
|
|
+ @DbField("dw.send_status")
|
|
|
private String sendStatus;
|
|
|
|
|
|
@DbField("ifnull(od.created_time,vod.created_time)")
|
zoujiajian