caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code

Browse Source
This commit is contained in:
paulGao 2022-03-29 10:04:36 +08:00
parent 36ce7593a9
commit 6d014a01bc
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/application.yml
View File

@ -25,15 +25,6 @@ spring:
admin: admin:
client: client:
url: http://192.168.0.116:8000 url: http://192.168.0.116:8000
# mongodb
data:
mongodb:
uri: 192.168.0.116:27017
database: lilishop
username: root
password: lilishop
authentication-database: admin
# replica-set-name: mongoreplset
cache: cache:
type: redis type: redis
# Redis # Redis
@ -191,7 +182,6 @@ logging:
cn.lili: info cn.lili: info
# org.hibernate: debug # org.hibernate: debug
# org.springframework: debug # org.springframework: debug
# org.springframework.data.mongodb.core: debug
file: file:
# 指定路径 # 指定路径
path: logs path: logs

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
View File

@ -124,8 +124,6 @@ public class WalletPlugin implements Payment {
//获取支付收银参数 //获取支付收银参数
CashierParam cashierParam = cashierSupport.cashierParam(payParam); CashierParam cashierParam = cashierSupport.cashierParam(payParam);
this.callBack(payParam, cashierParam); this.callBack(payParam, cashierParam);
} catch (Exception e) {
throw e;
} finally { } finally {
lock.unlock(); lock.unlock();
} }

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java
View File

@ -338,7 +338,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
Arrays.sort(hoursSored); Arrays.sort(hoursSored);
for (int i = 0; i < hoursSored.length; i++) { for (int i = 0; i < hoursSored.length; i++) {
SeckillTimelineVO tempTimeline = new SeckillTimelineVO(); SeckillTimelineVO tempTimeline = new SeckillTimelineVO();
boolean hoursSoredHour = (hoursSored[i] >= hour || ((i + 1) < hoursSored.length && hoursSored[i + 1] > hour)); boolean hoursSoredHour = (hoursSored[i] >= hour || ((i + 1) < hoursSored.length && hoursSored[i + 1] > hour) || hoursSored.length == 1);
if (hoursSoredHour) { if (hoursSoredHour) {
SimpleDateFormat format = new SimpleDateFormat(DatePattern.NORM_DATE_PATTERN); SimpleDateFormat format = new SimpleDateFormat(DatePattern.NORM_DATE_PATTERN);
String date = format.format(new Date()); String date = format.format(new Date());

6
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
View File

@ -240,7 +240,8 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
String brandName = ""; String brandName = "";
if (brandBuckets.get(i).getAggregations() != null && brandBuckets.get(i).getAggregations().get(ATTR_BRAND_NAME) != null) { if (brandBuckets.get(i).getAggregations() != null && brandBuckets.get(i).getAggregations().get(ATTR_BRAND_NAME) != null) {
brandName = this.getAggregationsBrandOptions(brandBuckets.get(i).getAggregations().get(ATTR_BRAND_NAME)); ParsedStringTerms aggregation = brandBuckets.get(i).getAggregations().get(ATTR_BRAND_NAME);
brandName = this.getAggregationsBrandOptions(aggregation);
if (StringUtils.isEmpty(brandName)) { if (StringUtils.isEmpty(brandName)) {
continue; continue;
} }
@ -250,7 +251,8 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
if (brandUrlBuckets != null && !brandUrlBuckets.isEmpty() && if (brandUrlBuckets != null && !brandUrlBuckets.isEmpty() &&
brandUrlBuckets.get(i).getAggregations() != null && brandUrlBuckets.get(i).getAggregations() != null &&
brandUrlBuckets.get(i).getAggregations().get(ATTR_BRAND_URL) != null) { brandUrlBuckets.get(i).getAggregations().get(ATTR_BRAND_URL) != null) {
brandUrl = this.getAggregationsBrandOptions(brandUrlBuckets.get(i).getAggregations().get(ATTR_BRAND_URL)); ParsedStringTerms aggregation = brandUrlBuckets.get(i).getAggregations().get(ATTR_BRAND_URL);
brandUrl = this.getAggregationsBrandOptions(aggregation);
if (StringUtils.isEmpty(brandUrl)) { if (StringUtils.isEmpty(brandUrl)) {
continue; continue;
} }