소스 검색

tt

release_toaliyun_real
xhxu 5 년 전
부모
커밋
8ebdc943ef
4개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. +3
    -0
      mallinkService/src/main/resources/mapper/TtCouponMapper.xml
  2. +0
    -2
      mallinkTTAdmin/src/main/java/com/iformall/TTAdminApplication.java
  3. +4
    -1
      mallinkTTAdmin/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java
  4. +0
    -1
      mallinkTTCApi/src/main/java/com/iformall/TTCApplication.java

+ 3
- 0
mallinkService/src/main/resources/mapper/TtCouponMapper.xml 파일 보기

@@ -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


+ 0
- 2
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.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}")


+ 4
- 1
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.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());


+ 0
- 1
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 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


불러오는 중...
취소
저장