sgb
/
zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化榜单排序及定时任务

zyj
sj 2 years ago
parent
2fa9950933
commit
3b05b235bc
8 changed files with 64 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      zsw-bxg/src/main/java/co/yixiang/app/modules/order/param/ProductReplyParam.java
  2. 2
      zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java
  3. 2
      zsw-bxg/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java
  4. 1
      zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java
  5. 8
      zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/impl/YxStoreHotListRecordServiceImpl.java
  6. 20
      zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/impl/YxStoreHotListServiceImpl.java
  7. 26
      zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
  8. 19
      zsw-bxg/src/main/java/co/yixiang/utils/TaskMsg.java

4
zsw-bxg/src/main/java/co/yixiang/app/modules/order/param/ProductReplyParam.java
Unescape View File

@ -16,8 +16,8 @@ import javax.validation.constraints.Size;
@Setter
public class ProductReplyParam {
@NotBlank(message = "评论不能为空")
@Size(min = 1, max = 200,message = "长度超过了限制")
// @NotBlank(message = "评论不能为空")
@Size(min = 0, max = 200,message = "长度超过了限制")
@ApiModelProperty(value = "商品评论内容")
private String comment;

2
zsw-bxg/src/main/java/co/yixiang/constant/ShopConstants.java
Unescape View File

@ -117,7 +117,7 @@ public interface ShopConstants {
/**
* 热门搜索
*/
String ZSW_HOT_SEARCH = "zsw_hot_search";
String ZSW_HOT_SEARCH = "yshop_hot_search";
/**
* 个人中心菜单
*/

2
zsw-bxg/src/main/java/co/yixiang/modules/activity/service/mapper/YxStoreCouponUserMapper.java
Unescape View File

@ -39,7 +39,7 @@ public interface YxStoreCouponUserMapper extends CoreMapper<YxStoreCouponUser> {
@Select("select *from yx_store_coupon_user where status = 0 AND is_fail=0 AND use_end_time <= #{endTime} AND tenant_id = 138")
@Select("select *from yx_store_coupon_user where status = 0 AND is_fail=0 AND use_end_time <= #{endTime}")
List<YxStoreCouponUser> selectUserCouponList(@Param("endTime") Date endTime);
//"状态（0：未使用，1：已使用, 2:已过期）"
}

1
zsw-bxg/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java
Unescape View File

@ -11,6 +11,7 @@ package co.yixiang.modules.category.rest;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.YshopException;
import co.yixiang.constant.ShopConstants;
import co.yixiang.exception.BadRequestException;
import co.yixiang.logging.aop.log.Log;
import co.yixiang.modules.aop.ForbidSubmit;
import co.yixiang.modules.category.domain.YxStoreCategory;

8
zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/impl/YxStoreHotListRecordServiceImpl.java
Unescape View File

@ -8,6 +8,8 @@
*/
package co.yixiang.modules.hotList.service.impl;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
import co.yixiang.common.service.impl.BaseServiceImpl;
import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.domain.PageResult;
@ -59,9 +61,9 @@ public class YxStoreHotListRecordServiceImpl extends BaseServiceImpl<YxStoreHotL
PageInfo<YxStoreHotListRecord> page = new PageInfo<>(queryAll(criteria));
PageResult<YxStoreHotListRecordDto> result=generator.convertPageInfo(page,YxStoreHotListRecordDto.class);
result.getContent().forEach(i->{
i.setHotListName(yxStoreHotListMapper.selectById(i.getHotListId()).getListName());
i.setCateName(storeCategoryMapper.selectById(i.getCateId()).getCateName());
i.setProductName(yxStoreProductService.getById(i.getProductId()).getStoreName());
i.setHotListName(ObjectUtil.isEmpty(yxStoreHotListMapper.selectById(i.getHotListId()))?"*原绑定榜单已被删除":yxStoreHotListMapper.selectById(i.getHotListId()).getListName());
i.setCateName(ObjectUtil.isEmpty(storeCategoryMapper.selectById(i.getCateId()))?"*原商品分类已被删除":storeCategoryMapper.selectById(i.getCateId()).getCateName());
i.setProductName(ObjectUtil.isEmpty(yxStoreProductService.getById(i.getProductId()))?"*原绑定商品已被删除":yxStoreProductService.getById(i.getProductId()).getStoreName());
});
return result;
}

20
zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/impl/YxStoreHotListServiceImpl.java
Unescape View File

@ -162,7 +162,7 @@ public class YxStoreHotListServiceImpl extends BaseServiceImpl<YxStoreHotListMap
LambdaQueryWrapper<YxStoreHotListRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YxStoreHotListRecord::getIsShow, ShopCommonEnum.SHOW_1.getValue());
wrapper.eq(YxStoreHotListRecord::getIsDel, CommonEnum.DEL_STATUS_0.getValue());
//获取所有评测列表(后期限制一年？)
//获取所有榜单记录列表(后期限制一年？)
List<YxStoreHotListRecord> list=yxStoreHotListRecordMapper.selectList(wrapper);
if(list.isEmpty()){
return null;
@ -182,8 +182,13 @@ public class YxStoreHotListServiceImpl extends BaseServiceImpl<YxStoreHotListMap
hotIdList.add(cate.getHotListId());
}
});
//批量查询榜单信息，并进行排序
LambdaQueryWrapper<YxStoreHotList> wrapperList=new LambdaQueryWrapper<>();
wrapperList.in(YxStoreHotList::getId,hotIdList).orderByAsc(YxStoreHotList::getSort);
ArrayList <Integer> list1=new ArrayList<>();
yxStoreHotListMapper.selectList(wrapperList).forEach(yxHotList->list1.add(yxHotList.getId()));
ArrayList<HotListDTO> hotListDTOS=new ArrayList<>();
hotIdList.forEach(hotId->{
list1.forEach(hotId->{
LambdaQueryWrapper<YxStoreHotListRecord> wrapper1= SerializationUtils.clone(wrapper);
//查出当前月份当前榜单的记录
List<YxStoreHotListRecord> recordCateList=yxStoreHotListRecordMapper.selectList(wrapper1.eq(YxStoreHotListRecord::getHotListId,hotId).eq(YxStoreHotListRecord::getMouth,mouth));
@ -254,7 +259,7 @@ public class YxStoreHotListServiceImpl extends BaseServiceImpl<YxStoreHotListMap
LambdaQueryWrapper<YxStoreHotListRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YxStoreHotListRecord::getIsShow, ShopCommonEnum.SHOW_1.getValue());
wrapper.eq(YxStoreHotListRecord::getIsDel, CommonEnum.DEL_STATUS_0.getValue());
//获取所有评测列表(后期限制一年？)
//获取所有榜单记录列表(后期限制一年？)
List<YxStoreHotListRecord> list=yxStoreHotListRecordMapper.selectList(wrapper);
if(list.isEmpty()){
return null;
@ -265,14 +270,19 @@ public class YxStoreHotListServiceImpl extends BaseServiceImpl<YxStoreHotListMap
String mouth=Collections.max(mouthList);
List<YxStoreHotListRecord> recordList=yxStoreHotListRecordMapper.selectList(wrapper.eq(YxStoreHotListRecord::getMouth,mouth));
LinkedHashSet<Integer> hotIdList=new LinkedHashSet<>();
//获得不重复的榜单信息
//获得不重复的榜单id
recordList.forEach(cate->{
if(ObjectUtil.isNotNull(yxStoreHotListMapper.selectById(cate.getHotListId()))){
hotIdList.add(cate.getHotListId());
}
});
//批量查询榜单信息，并进行排序
LambdaQueryWrapper<YxStoreHotList> wrapperList=new LambdaQueryWrapper<>();
wrapperList.in(YxStoreHotList::getId,hotIdList).orderByAsc(YxStoreHotList::getSort);
ArrayList <Integer> list1=new ArrayList<>();
yxStoreHotListMapper.selectList(wrapperList).forEach(yxHotList->list1.add(yxHotList.getId()));
ArrayList<HotListDTO> hotListDTOS=new ArrayList<>();
hotIdList.forEach(hotId->{
list1.forEach(hotId->{
LambdaQueryWrapper<YxStoreHotListRecord> wrapper1= SerializationUtils.clone(wrapper);
//查出当前月份当前榜单的记录
List<YxStoreHotListRecord> recordCateList=yxStoreHotListRecordMapper.selectList(wrapper1.eq(YxStoreHotListRecord::getHotListId,hotId).eq(YxStoreHotListRecord::getMouth,mouth));

26
zsw-bxg/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java
Unescape View File

@ -112,6 +112,32 @@ public class StoreProductController {
return new ResponseEntity<>(queryAll,HttpStatus.OK);
}
@Log("查询所有商品分类及下面的商品")
@ApiOperation(value = "查询所有商品分类及下面的商品")
@GetMapping(value = "/yxStoreProductAndCart")
public ResponseEntity getYxStoreProductsAndCart(){
//商品分类
List<YxStoreCategory> storeCategories = yxStoreCategoryService.lambdaQuery()
.eq(YxStoreCategory::getIsShow, ShopCommonEnum.SHOW_1.getValue())
.list();
List<Map<String,Object>> cateList = new ArrayList<>();
storeCategories.forEach(yxStoreCategory -> {
String html = "|-----";
String newHtml = "";
Map<String,Object> map = new HashMap<>();
newHtml = String.join("", Collections.nCopies(1,html));
map.put("value",yxStoreCategory.getId());
map.put("label",newHtml + yxStoreCategory.getCateName());
List<YxStoreProduct> list=yxStoreProductService.lambdaQuery()
.eq(YxStoreProduct::getIsShow,ShopCommonEnum.SHOW_1.getValue())
.eq(YxStoreProduct::getCateId,yxStoreCategory.getId())
.list();
map.put("children",list);
cateList.add(map);
});
return new ResponseEntity<>(cateList,HttpStatus.OK);
}
@ForbidSubmit
@Log("新增/修改商品")
@ApiOperation(value = "新增/修改商品")

19
zsw-bxg/src/main/java/co/yixiang/modules/hotList/service/impl/TaskMsg.java → zsw-bxg/src/main/java/co/yixiang/utils/TaskMsg.java
Unescape View File

@ -1,6 +1,8 @@
package co.yixiang.modules.hotList.service.impl;
package co.yixiang.utils;
import cn.hutool.core.date.DateUtil;
import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.enums.CommonEnum;
import co.yixiang.enums.ShopCommonEnum;
import co.yixiang.event.TemplateBean;
@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Calendar;
import java.util.Date;
@ -42,10 +45,11 @@ public class TaskMsg {
//定时器,每天下午17点触发
@Scheduled(cron = "0 0 17 * * ?")
// @Scheduled(cron = "0 50 17 * * ?")
// @Scheduled(cron = "0/8 * * * * ? ")
public void scheduled(){
log.info("=====>>>>>使用cron {}",System.currentTimeMillis());
log.info("=====>>>>>使用cron {}",System.currentTimeMillis());
TenantContextHolder.setIgnore(true);
//查出所有用户拥有的券使用时间小于24小时且未使用的券
Date now=new Date();
Date endTime = DateUtil.offsetDay(now,1);
@ -62,9 +66,10 @@ public class TaskMsg {
});
}
@Scheduled(fixedRate = 20000)
public void execute() {
log.info("[execute][定时第 ({}) 次执行]", System.currentTimeMillis());
// @Scheduled(fixedRate = 20000)
// public void execute() {
// log.info("[execute][定时第 ({}) 次执行]", System.currentTimeMillis());
// TenantContextHolder.setIgnore(true);
// Date now=new Date();
// Date endTime = DateUtil.offsetDay(now,1);
// List<YxStoreCouponUser> storeCouponUsers=yxStoreCouponUserMapper.selectUserCouponList(endTime);
@ -78,14 +83,16 @@ public class TaskMsg {
// .build();
// publisher.publishEvent(new TemplateEvent(this, templateBean));
// });
}
// }
//每个月最后一天23:30生成该月的榜单
@Transactional(rollbackFor = Exception.class)
@Scheduled(cron = "0 30 23 L * ?")
public void setYxStoreHotListRecord(){
log.info("=====>>>>>使用cron {}",System.currentTimeMillis());
log.info("=====>>>>>使用cron {}",System.currentTimeMillis());
TenantContextHolder.setIgnore(true);
LambdaQueryWrapper<YxStoreProduct> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(YxStoreProduct::getIsShow, ShopCommonEnum.SHOW_1.getValue())
.eq(YxStoreProduct::getIsDel, CommonEnum.DEL_STATUS_0.getValue())
Write Preview
Loading…
Cancel
Save