diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
index 2199db1fa..b3d1520a1 100644
--- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
@@ -129,6 +129,9 @@
and c.`merchant_id` = #{merchantId}
+
+ and m.`name` like concat('%', #{merchantName},'%')
+
and c.id in
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/TTAdminApplication.java b/mallinkTTAdmin/src/main/java/com/iformall/TTAdminApplication.java
index d6cbd7f2c..941166e64 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/TTAdminApplication.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/TTAdminApplication.java
@@ -8,7 +8,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.annotation.EnableScheduling;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
/**
@@ -21,7 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableEncryptableProperties
@EnableAsync
@EnableRocketMQ
-@EnableScheduling
public class TTAdminApplication {
@Value("${fm.exception}")
diff --git a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
index a74bf294f..e6e304d26 100644
--- a/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
+++ b/mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
@@ -13,6 +13,8 @@ import com.iformall.utils.DateUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -21,7 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-@Component
+@Configuration
+@EnableScheduling
public class TtOrderExpiringSchedule {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
diff --git a/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java b/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
index 2d1a3dbb2..d2b7d46f4 100644
--- a/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
+++ b/mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java
@@ -9,7 +9,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
-import org.springframework.scheduling.annotation.EnableScheduling;
/**
* @author chenkx