code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711
2023-03-29 16:05:04 +08:00
parent fad7c4a39d fc464c0564
commit 2aaf677605
9 changed files with 60 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@@ -202,8 +202,8 @@ public enum ResultCode {
ORDER_BATCH_DELIVER_ERROR(31013, "批量发货,文件读取失败"),
ORDER_ITEM_NOT_EXIST(31014, "当前订单项不存在！"),
POINT_NOT_ENOUGH(31015, "当前会员积分不足购买当前积分商品！"),
ORDER_LABEL_ORDER_ERROR(31016, "订单不能打印电子面单"),
ORDER_PRICE_ERROR(31017,"订单金额不能小于等于0"),
/**

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

@@ -98,7 +98,7 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
@Override
public EsGoodsRelatedInfo getSelector(EsGoodsSearchDTO goodsSearch, PageVO pageVo) {
NativeSearchQueryBuilder builder = createSearchQueryBuilder(goodsSearch, null);
NativeSearchQueryBuilder builder = createSearchQueryBuilder(goodsSearch, pageVo);
//分类
AggregationBuilder categoryNameBuilder = AggregationBuilders.terms("categoryNameAgg").field("categoryNamePath.keyword");
builder.addAggregation(AggregationBuilders.terms("categoryAgg").field("categoryPath").subAggregation(categoryNameBuilder));

2
framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java
View File

@@ -82,7 +82,7 @@ public class Store extends BaseEntity {
@ApiModelProperty(value = "服务评分")
private Double serviceScore;
@ApiModelProperty(value = "物流描述")
@ApiModelProperty(value = "物流评分")
private Double deliveryScore;
@ApiModelProperty(value = "商品数量")

6
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
View File

@@ -189,7 +189,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
}
/**
* 修改店铺详细细腻
* 修改店铺详细信息
*
* @param storeEditDTO 修改店铺信息
*/
@@ -304,7 +304,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
//获取当前操作的店铺
Store store = getStoreByMember();
//校验迪纳普状态
//校验店铺状态
checkStoreStatus(store);
StoreDetail storeDetail = storeDetailService.getStoreDetail(store.getId());
//设置店铺的银行信息
@@ -317,7 +317,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
//获取当前操作的店铺
Store store = getStoreByMember();
//校验迪纳普状态
//校验店铺状态
checkStoreStatus(store);
BeanUtil.copyProperties(storeOtherInfoDTO, store);