From 96dac6da1a20dfa2ecea41544ca21c31c93e7bb2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 14:41:49 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index 1942e9b..69b54b3 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -1,10 +1,13 @@
package com.xzx.gc.shop.service;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
@@ -41,6 +44,8 @@
ScoreGoodsImagesMapper scoreGoodsImagesMapper;
@Resource
ScoreGoodsStyleMapper scoreGoodsStyleMapper;
+ @Resource
+ ScoreGoodsSearchMapper scoreGoodsSearchMapper;
@Autowired
private MqUtil mqUtil;
@@ -209,7 +214,9 @@
public void updateGoods(UpdateGoodsDto model) {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
+// ScoreGoods scoreGoods = objectMapper.convertValue(model, ScoreGoods.class);
+ ScoreGoods scoreGoods = BeanUtil.copyProperties(model, ScoreGoods.class);
+ log.info("抢购时间：{}, {}", scoreGoods.getQgStartTime(), scoreGoods.getQgEndTime());
scoreGoodsMapper.updateByPrimaryKey(scoreGoods);
//轮播图
@@ -251,6 +258,8 @@
if(CollUtil.isNotEmpty(scoreGoodsSkuDtos)){
for(ScoreGoodsSkuDto scoreGoodsSkuDto : scoreGoodsSkuDtos){
ScoreGoodsSku scoreGoodsSku = objectMapper.convertValue(scoreGoodsSkuDto, ScoreGoodsSku.class);
+ scoreGoodsSku.setGoodsId(scoreGoods.getId());
+ scoreGoodsSku.setStyleId(scoreGoodsStyle.getId());
scoreGoodsSkuMapper.insertSelective(scoreGoodsSku);
}
}
@@ -282,6 +291,8 @@
}else{
ScoreGoods scoreGoods = new ScoreGoods();
scoreGoods.setIsQg(ScoreGoods.ISQG_NO);
+ scoreGoods.setQgEndTime(null);
+ scoreGoods.setQgStartTime(null);
Example exampleGoods = new Example(ScoreGoods.class);
Example.Criteria criteriaGoods = exampleGoods.createCriteria();
criteriaGoods.andEqualTo("id",id);
@@ -307,7 +318,20 @@
PageHelper.startPage(xcxGoodsListDto.getPageNo(), xcxGoodsListDto.getPageSize());
List<XcxGoodsListVo> data = scoreGoodsMapper.selectXcxGoodsList(xcxGoodsListDto);
-
+ if(StrUtil.isNotEmpty(xcxGoodsListDto.getName())){
+ Example exampleSearch = new Example(ScoreGoodsSearch.class);
+ Example.Criteria criteriaSearch = exampleSearch.createCriteria();
+ criteriaSearch.andEqualTo("contents",xcxGoodsListDto.getName());
+ criteriaSearch.andEqualTo("userId",xcxGoodsListDto.getUserId());
+ List<ScoreGoodsSearch> scoreGoodsSearches = scoreGoodsSearchMapper.selectByExample(exampleSearch);
+ if(CollUtil.isEmpty(scoreGoodsSearches)){
+ ScoreGoodsSearch scoreGoodsSearch = new ScoreGoodsSearch();
+ scoreGoodsSearch.setUserId(xcxGoodsListDto.getUserId());
+ scoreGoodsSearch.setContents(xcxGoodsListDto.getName());
+ scoreGoodsSearch.setCreatedTime(new Date());
+ scoreGoodsSearchMapper.insert(scoreGoodsSearch);
+ }
+ }
return new PageInfo<>(data);
}
@@ -335,4 +359,23 @@
}
return data;
}
+
+ public List<GoodsSearchVo> goodsSearch(GoodsSearchDto goodsSearchDto) {
+ return scoreGoodsSearchMapper.goodsSearch(goodsSearchDto);
+ }
+
+ public void delGoodsSearch(Long id, String userId) {
+ Example exampleSearch = new Example(ScoreGoodsSearch.class);
+ Example.Criteria criteriaSearch = exampleSearch.createCriteria();
+ criteriaSearch.andEqualTo("id",id);
+ criteriaSearch.andEqualTo("userId",userId);
+ scoreGoodsSearchMapper.deleteByExample(exampleSearch);
+ }
+
+ public void delAllSearch(String userId) {
+ Example exampleSearch = new Example(ScoreGoodsSearch.class);
+ Example.Criteria criteriaSearch = exampleSearch.createCriteria();
+ criteriaSearch.andEqualTo("userId",userId);
+ scoreGoodsSearchMapper.deleteByExample(exampleSearch);
+ }
}
--
Gitblit v1.9.1