Commit c490f689 by huluobin

update

parent 4d51d256
...@@ -34,6 +34,7 @@ public class CouponsForConsumption implements Serializable { ...@@ -34,6 +34,7 @@ public class CouponsForConsumption implements Serializable {
@ApiModelProperty(value = "订单金额") @ApiModelProperty(value = "订单金额")
private BigDecimal orderAmountUp; private BigDecimal orderAmountUp;
private BigDecimal orderAmountDown; private BigDecimal orderAmountDown;
private Integer orderAmountType; private Integer orderAmountType;
@ApiModelProperty(value = "服务类型") @ApiModelProperty(value = "服务类型")
...@@ -49,7 +50,7 @@ public class CouponsForConsumption implements Serializable { ...@@ -49,7 +50,7 @@ public class CouponsForConsumption implements Serializable {
private String messageInfo; private String messageInfo;
private Integer isDelete; private Integer isDelete;
private LocalDateTime deleteDate; private LocalDateTime deleteDate;
private Integer deleteUser; private String deleteUser;
private Integer storeId; private Integer storeId;
private LocalDateTime createDate; private LocalDateTime createDate;
private Integer createUser; private Integer createUser;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
from order_manage t1 from order_manage t1
LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 1 LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 1
and t1.total_price <= t2.order_amount_up and t1.total_price <= t2.order_amount_up
and t1.total_price > t2.order_amount_down and t1.total_price >= t2.order_amount_down
<if test="t2.order_serve_type != null"> <if test="t2.order_serve_type != null">
LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id LEFT JOIN order_serve t3 on t1.id = t3.order_id and t2.order_serve_type = t3.serve_type_id
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment