国际化

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCombinationController.java

@@ -17,6 +17,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
@@ -169,7 +170,10 @@ public class AppCombinationController {
         Date now = new Date();
         criteria.andLessThanOrEqualTo("startTime", now);
         criteria.andGreaterThanOrEqualTo("stopTime", now);
-        
+        if(!ObjectUtils.isEmpty(dto.getStoreName())){
+            criteria.andLike("productName", "%" + dto.getStoreName() + "%");
+        }
+
         PageInfo pageInfo = null;
         try {
             List<StoreCombination> list = storeCombinationService.findByCondition(condition);

mall-service/src/main/resources/bootstrap.properties

@@ -69,4 +69,8 @@ dubbo.registry.check=false
 
 spring.messages.basename=i18n/messages,i18n/messages_zh_CN
 spring.messages.encoding=UTF-8
-spring.messages.cache-duration=0
+spring.messages.cache-duration=0
+
+logging.level.com.txz.mall.dao=DEBUG
+logging.level.org.apache.ibatis=DEBUG
+logging.level.java.sql=DEBUG