Merge branch 'master' into 4.1

# Conflicts:
#	src/main/resources/mapper/market/coupon/CouponsForConsumptionMapper.xml

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

@@ -5,10 +5,11 @@
     <select id="getByOrderId" resultType="com.gogirl.domain.market.coupon.CouponsForConsumption">
         SELECT t2.*
         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 t2.is_delete = 0
             and t1.total_price &lt;= t2.order_amount_up
             and t1.total_price &gt;= t2.order_amount_down
-                 LEFT JOIN order_serve t3 on t1.id = t3.order_id and (t2.order_serve_type = t3.serve_type_id or t2.order_serve_type is null)
+                 LEFT JOIN order_serve t3 on t1.id = t3.order_id and (t2.order_serve_type = t3.serve_type_id or
+                                                                      t2.order_serve_type is null)
         where t1.id = #{orderId}
           and t2.id is not null
           and t1.department_id = t2.store_id
@@ -16,11 +17,12 @@
         union
         SELECT t2.*
         from order_manage t1
-                 LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 2
+                 LEFT JOIN coupons_for_consumption t2 on t2.order_amount_type = 2 and t2.is_delete = 0
             and t1.total_payment_amount &lt;= t2.order_amount_up
             and t1.total_payment_amount &gt;= t2.order_amount_down
             and t1.department_id = t2.store_id
-                 LEFT JOIN order_serve t3 on t1.id = t3.order_id and (t2.order_serve_type = t3.serve_type_id or t2.order_serve_type is null)
+                 LEFT JOIN order_serve t3 on t1.id = t3.order_id and (t2.order_serve_type = t3.serve_type_id or
+                                                                      t2.order_serve_type is null)
         where t1.id = #{orderId}
           and t2.id is not null
           and t3.id is not null