Merge branch 'master' into 4.1

src/main/java/com/gogirl/domain/market/coupon/CouponsForConsumption.java

@@ -34,6 +34,7 @@ public class CouponsForConsumption implements Serializable {
     @ApiModelProperty(value = "订单金额")
     private BigDecimal orderAmountUp;
     private BigDecimal orderAmountDown;
+
     private Integer orderAmountType;
 
     @ApiModelProperty(value = "服务类型")
@@ -49,7 +50,7 @@ public class CouponsForConsumption implements Serializable {
     private String messageInfo;
     private Integer isDelete;
     private LocalDateTime deleteDate;
-    private Integer deleteUser;
+    private String deleteUser;
     private Integer storeId;
     private LocalDateTime createDate;
     private Integer createUser;

src/main/resources/mapper/market/coupon/CouponsForConsumptionMapper.xml

@@ -7,7 +7,7 @@
         from order_manage t1
                  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_down
+            and t1.total_price >= t2.order_amount_down
             <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
             </if>