Merge branch 'master' into 4.1

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

@@ -68,6 +68,7 @@ public class CouponsGiftServiceImpl extends ServiceImpl<CouponsGiftMapper, Coupo
                 case CouponsGift.BEHAVIOR_FINISH_ORDER:
                     Integer orderId = Integer.parseInt(attach.toString());
                     CouponsForConsumption couponsForConsumption = couponsForConsumptionMapper.getByOrderId(orderId);
+                    if (couponsForConsumption != null) {
                         if (couponsForConsumption.getCouponId() != null) {
                             couponService.sendCoupon(couponsForConsumption.getCouponId(), customerId);
                         }
@@ -79,6 +80,7 @@ public class CouponsGiftServiceImpl extends ServiceImpl<CouponsGiftMapper, Coupo
                             adminFeign.sendMessage(sendMessageRequest);
                         }
                     }
+            }
         } catch (Exception e) {
             log.error("行为触发发券失败" + e.getMessage(), e);
         }

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

@@ -9,7 +9,7 @@
             and t1.total_price <= t2.order_amount_up
             and t1.total_price >= 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)
+                                                                      t2.order_serve_type = 0)
         where t1.id = #{orderId}
           and t2.id is not null
           and t1.department_id = t2.store_id
@@ -22,7 +22,7 @@
             and t1.total_payment_amount >= 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)
+                                                                      t2.order_serve_type = 0)
         where t1.id = #{orderId}
           and t2.id is not null
           and t3.id is not null