| @@ -129,6 +129,9 @@ | |||||
| <if test=" null != merchantId "> | <if test=" null != merchantId "> | ||||
| and c.`merchant_id` = #{merchantId} | and c.`merchant_id` = #{merchantId} | ||||
| </if> | </if> | ||||
| <if test=" null != merchantName and ''!=merchantName"> | |||||
| and m.`name` like concat('%', #{merchantName},'%') | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and c.id in | and c.id in | ||||
| @@ -8,7 +8,6 @@ import org.springframework.boot.SpringApplication; | |||||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | import org.springframework.boot.autoconfigure.SpringBootApplication; | ||||
| import org.springframework.context.annotation.Bean; | import org.springframework.context.annotation.Bean; | ||||
| import org.springframework.scheduling.annotation.EnableAsync; | import org.springframework.scheduling.annotation.EnableAsync; | ||||
| import org.springframework.scheduling.annotation.EnableScheduling; | |||||
| import springfox.documentation.swagger2.annotations.EnableSwagger2; | import springfox.documentation.swagger2.annotations.EnableSwagger2; | ||||
| /** | /** | ||||
| @@ -21,7 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; | |||||
| @EnableEncryptableProperties | @EnableEncryptableProperties | ||||
| @EnableAsync | @EnableAsync | ||||
| @EnableRocketMQ | @EnableRocketMQ | ||||
| @EnableScheduling | |||||
| public class TTAdminApplication { | public class TTAdminApplication { | ||||
| @Value("${fm.exception}") | @Value("${fm.exception}") | ||||
| @@ -13,6 +13,8 @@ import com.iformall.utils.DateUtils; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | 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.scheduling.annotation.Scheduled; | ||||
| import org.springframework.stereotype.Component; | import org.springframework.stereotype.Component; | ||||
| @@ -21,7 +23,8 @@ import java.util.HashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| @Component | |||||
| @Configuration | |||||
| @EnableScheduling | |||||
| public class TtOrderExpiringSchedule { | public class TtOrderExpiringSchedule { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Bean; | |||||
| import org.springframework.context.annotation.EnableAspectJAutoProxy; | import org.springframework.context.annotation.EnableAspectJAutoProxy; | ||||
| import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; | ||||
| import org.springframework.scheduling.annotation.EnableScheduling; | |||||
| /** | /** | ||||
| * @author chenkx | * @author chenkx | ||||