cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

顺丰轨迹查询处理

Browse Source
This commit is contained in:
taozi
2020-12-17 21:44:34 +08:00
committed by xuwenbo
parent 1bf053bfd8
commit ef71e86874
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-admin/src/main/resources/config/application-prod.yml
View File

@ -92,5 +92,3 @@ file:
# 文件大小 /M # 文件大小 /M
maxSize: 100 maxSize: 100
avatarMaxSize: 5 avatarMaxSize: 5

11
yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java
View File

@ -235,7 +235,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YxStoreProduct::getIsShow, CommonEnum.SHOW_STATUS_1.getValue()); wrapper.eq(YxStoreProduct::getIsShow, CommonEnum.SHOW_STATUS_1.getValue());
wrapper.eq(YxStoreProduct::getIsDel, CommonEnum.DEL_STATUS_0.getValue()); wrapper.eq(YxStoreProduct::getIsDel, CommonEnum.DEL_STATUS_0.getValue());
// wrapper.eq(YxStoreProduct::getIsIntegral, CommonEnum.SHOW_STATUS_1.getValue());
//多字段模糊查询分类搜索 //多字段模糊查询分类搜索
if (StrUtil.isNotBlank(productQueryParam.getSid()) && if (StrUtil.isNotBlank(productQueryParam.getSid()) &&
@ -412,7 +411,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YxStoreProduct::getIsShow, ShopCommonEnum.SHOW_1.getValue()) wrapper.eq(YxStoreProduct::getIsShow, ShopCommonEnum.SHOW_1.getValue())
// .eq(YxStoreProduct::getIsIntegral,CommonEnum.SHOW_STATUS_1.getValue())
.orderByDesc(YxStoreProduct::getSort); .orderByDesc(YxStoreProduct::getSort);
// order // order
@ -681,7 +679,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
valueMap.put("seckill_price", 0); valueMap.put("seckill_price", 0);
valueMap.put("pink_stock", 0); valueMap.put("pink_stock", 0);
valueMap.put("seckill_stock", 0); valueMap.put("seckill_stock", 0);
valueMap.put("integral", 0);
if (id > 0) { if (id > 0) {
YxStoreProductAttrValue storeProductAttrValue = yxStoreProductAttrValueService YxStoreProductAttrValue storeProductAttrValue = yxStoreProductAttrValueService
.getOne(Wrappers.<YxStoreProductAttrValue>lambdaQuery() .getOne(Wrappers.<YxStoreProductAttrValue>lambdaQuery()
@ -702,7 +699,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
valueMap.put("seckill_price", storeProductAttrValue.getSeckillPrice()); valueMap.put("seckill_price", storeProductAttrValue.getSeckillPrice());
valueMap.put("pink_stock", storeProductAttrValue.getPinkStock()); valueMap.put("pink_stock", storeProductAttrValue.getPinkStock());
valueMap.put("seckill_stock", storeProductAttrValue.getSeckillStock()); valueMap.put("seckill_stock", storeProductAttrValue.getSeckillStock());
valueMap.put("integral", storeProductAttrValue.getIntegral());
} }
} }
@ -834,13 +830,6 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl<StoreProductMappe
headerMap.put("slot", "volume"); headerMap.put("slot", "volume");
headerMap.put("align", align); headerMap.put("align", align);
headerMap.put("minWidth", 140); headerMap.put("minWidth", 140);
headerMapList.add(ObjectUtil.clone(headerMap));
headerMap.put("title", "所需兑换积分");
headerMap.put("slot", "integral");
headerMap.put("align", align);
headerMap.put("minWidth", 140);
headerMapList.add(ObjectUtil.clone(headerMap));
if (isActivity) { if (isActivity) {
headerMap.put("title", "拼团价"); headerMap.put("title", "拼团价");