commit
226d66c22e
@ -51,10 +51,6 @@
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
|
@ -133,7 +133,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
|
||||
//获取商品ID列表
|
||||
List<String> list = this.baseMapper.getGoodsIdByStoreId(storeId);
|
||||
//下架店铺下的商品
|
||||
updateGoodsMarketAble(list, GoodsStatusEnum.DOWN, "店铺关闭");
|
||||
this.updateGoodsMarketAbleByStoreId(storeId, GoodsStatusEnum.DOWN, "店铺关闭");
|
||||
|
||||
applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("下架商品",
|
||||
rocketmqCustomProperties.getGoodsTopic(), GoodsTagsEnum.DOWN.name(), JSONUtil.toJsonStr(list)));
|
||||
|
@ -312,9 +312,8 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper, GoodsSku> i
|
||||
map.put("data", goodsSkuDetail);
|
||||
|
||||
//获取分类
|
||||
String[] split = goodsSkuDetail.getCategoryPath().split(",");
|
||||
map.put("wholesaleList", wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId()));
|
||||
map.put("categoryName", categoryService.getCategoryNameByIds(Arrays.asList(split)));
|
||||
map.put("wholesaleList", GoodsSalesModeEnum.WHOLESALE.name().equals(goodsVO.getSalesModel()) ? wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId()) : Collections.emptyList());
|
||||
map.put("categoryName", CharSequenceUtil.isNotEmpty(goodsIndex.getCategoryNamePath()) ? goodsIndex.getCategoryNamePath().split(",") : null);
|
||||
|
||||
//获取规格信息
|
||||
map.put("specs", this.groupBySkuAndSpec(goodsVO.getSkuList()));
|
||||
|
@ -1,6 +1,5 @@
|
||||
package cn.lili.modules.permission.serviceimpl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.SearchVO;
|
||||
@ -9,7 +8,9 @@ import cn.lili.modules.permission.repository.SystemLogRepository;
|
||||
import cn.lili.modules.permission.service.SystemLogService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.elasticsearch.common.unit.Fuzziness;
|
||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
||||
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
|
||||
import org.elasticsearch.index.query.QueryBuilders;
|
||||
import org.elasticsearch.search.sort.SortBuilders;
|
||||
import org.elasticsearch.search.sort.SortOrder;
|
||||
@ -82,25 +83,22 @@ public class SystemLogServiceImpl implements SystemLogService {
|
||||
}
|
||||
|
||||
if (CharSequenceUtil.isNotEmpty(operatorName)) {
|
||||
nativeSearchQueryBuilder.withFilter(QueryBuilders.wildcardQuery("username", "*" + operatorName + "*"));
|
||||
nativeSearchQueryBuilder.withQuery(QueryBuilders.matchQuery("username", operatorName));
|
||||
}
|
||||
|
||||
if (CharSequenceUtil.isNotEmpty(key)) {
|
||||
BoolQueryBuilder filterBuilder = new BoolQueryBuilder();
|
||||
filterBuilder.should(QueryBuilders.wildcardQuery("requestUrl", "*" + key + "*"))
|
||||
.should(QueryBuilders.wildcardQuery("requestParam", "*" + key + "*"))
|
||||
.should(QueryBuilders.wildcardQuery("responseBody", "*" + key + "*"))
|
||||
.should(QueryBuilders.wildcardQuery("name", "*" + key + "*"));
|
||||
nativeSearchQueryBuilder.withFilter(filterBuilder);
|
||||
MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(key, "requestUrl", "requestParam", "responseBody", "name");
|
||||
multiMatchQueryBuilder.fuzziness(Fuzziness.AUTO);
|
||||
nativeSearchQueryBuilder.withFilter(multiMatchQueryBuilder);
|
||||
}
|
||||
//时间有效性判定
|
||||
if (searchVo.getConvertStartDate() != null && searchVo.getConvertEndDate() != null) {
|
||||
BoolQueryBuilder filterBuilder = new BoolQueryBuilder();
|
||||
//大于方法
|
||||
filterBuilder.must(
|
||||
filterBuilder.filter(
|
||||
QueryBuilders.rangeQuery("createTime")
|
||||
.gte(DateUtil.format(searchVo.getConvertStartDate(), "dd/MM/yyyy"))
|
||||
.lte(DateUtil.format(searchVo.getConvertEndDate(), "dd/MM/yyyy")).format("dd/MM/yyyy||yyyy"));
|
||||
.gte(searchVo.getConvertStartDate().getTime())
|
||||
.lte(searchVo.getConvertEndDate().getTime()));
|
||||
|
||||
nativeSearchQueryBuilder.withFilter(filterBuilder);
|
||||
}
|
||||
|
@ -293,6 +293,7 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
|
||||
LambdaUpdateWrapper<MemberCoupon> updateWrapper = new LambdaUpdateWrapper<>();
|
||||
updateWrapper.in(MemberCoupon::getId, memberCouponIds);
|
||||
updateWrapper.set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.NEW.name());
|
||||
updateWrapper.set(MemberCoupon::getConsumptionTime, null);
|
||||
return this.update(updateWrapper);
|
||||
}
|
||||
|
||||
|
@ -455,7 +455,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
|
||||
public void deleteIndex(Map<String, Object> queryFields) {
|
||||
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
|
||||
for (Map.Entry<String, Object> entry : queryFields.entrySet()) {
|
||||
boolQueryBuilder.filter(QueryBuilders.termsQuery(entry.getKey(), entry.getValue()));
|
||||
boolQueryBuilder.filter(QueryBuilders.termsQuery(entry.getKey(), entry.getValue().toString()));
|
||||
}
|
||||
|
||||
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest();
|
||||
|
@ -235,11 +235,16 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
|
||||
public boolean disable(String id) {
|
||||
Store store = this.getById(id);
|
||||
if (store != null) {
|
||||
store.setStoreDisable(StoreStatusEnum.CLOSED.value());
|
||||
|
||||
LambdaUpdateWrapper<Store> storeLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
|
||||
storeLambdaUpdateWrapper.eq(Store::getId, id);
|
||||
storeLambdaUpdateWrapper.set(Store::getStoreDisable, StoreStatusEnum.CLOSED.value());
|
||||
boolean update = this.update(storeLambdaUpdateWrapper);
|
||||
//下架所有此店铺商品
|
||||
goodsService.underStoreGoods(id);
|
||||
return this.updateById(store);
|
||||
if (update) {
|
||||
goodsService.underStoreGoods(id);
|
||||
}
|
||||
return update;
|
||||
}
|
||||
|
||||
throw new ServiceException(ResultCode.STORE_NOT_EXIST);
|
||||
|
@ -19,6 +19,11 @@
|
||||
<artifactId>framework</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-websocket</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
2
pom.xml
2
pom.xml
@ -26,7 +26,7 @@
|
||||
<images-version>1</images-version>
|
||||
<alipay-sdk-version>4.22.32.ALL</alipay-sdk-version>
|
||||
<mybatis-plus-version>3.5.1</mybatis-plus-version>
|
||||
<Hutool-version>5.8.0</Hutool-version>
|
||||
<Hutool-version>5.8.14</Hutool-version>
|
||||
<TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
|
||||
<jasypt-version>3.0.4</jasypt-version>
|
||||
<neetl-version>2.9.10</neetl-version>
|
||||
|
Loading…
x
Reference in New Issue
Block a user