update

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("行为触发发券失败" + e.getMessage());
+            log.error("行为触发发券失败" + e.getMessage(), e);
         }
     }
 }

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

@@ -50,6 +50,7 @@ public class CouponsForConsumption implements Serializable {
     private String messageInfo;
     private Integer isDelete;
     private LocalDateTime deleteDate;
+
     private String deleteUser;
     private Integer storeId;
     private LocalDateTime createDate;

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

@@ -8,15 +8,11 @@
                  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>
+                 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
-          <if test="t2.order_serve_type != null">
           and t3.id is not null
-          </if>
         union
         SELECT t2.*
         from order_manage t1
@@ -24,14 +20,10 @@
             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>
+                 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
-          <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

src/test/java/com/gogirl/application/market/coupon/impl/CouponsGiftServiceImplTest.java

+package com.gogirl.application.market.coupon.impl;
+
+import com.gogirl.application.market.coupon.ICouponsGiftService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/11/12 2:00 下午
+ */
+@ActiveProfiles("prod")
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+public class CouponsGiftServiceImplTest {
+
+    @Resource
+    ICouponsGiftService couponsGiftService;
+
+    @Test
+    public void sendGift() {
+        couponsGiftService.sendGift(24383,3,17707);
+    }
+}