Merge branch 'master' into 4.1

src/main/java/com/gogirl/application/market/coupon/impl/CouponsGiftServiceImpl.java

@@ -80,7 +80,7 @@ public class CouponsGiftServiceImpl extends ServiceImpl<CouponsGiftMapper, Coupo
                     }
             }
         } catch (Exception e) {
-            log.error("行为触发发券失败");
+            log.error("行为触发发券失败" + e.getMessage());
         }
     }
 }

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

@@ -8,11 +8,15 @@
                  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
+            <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>
         where t1.id = #{orderId}
           and t2.id is not null
           and t1.department_id = t2.store_id
+          <if test="t2.order_serve_type != null">
           and t3.id is not null
+          </if>
         union
         SELECT t2.*
         from order_manage t1
@@ -20,12 +24,17 @@
             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
+                 <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>
         where t1.id = #{orderId}
           and t2.id is not null
+          <if test="t2.order_serve_type != null">
           and t3.id is not null
+          </if>
           and t1.department_id = t2.store_id
         order by orders
         limit 1
     </select>
+
 </mapper>