From 34f2977c2dc250284c61b1195e1295465cbebbb2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 15:06:43 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 9e9985a..d66a17b 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,5 +1,6 @@
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.DateUnit;
@@ -209,7 +210,8 @@
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);
scoreGoodsMapper.updateByPrimaryKey(scoreGoods);
//轮播图
@@ -251,6 +253,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 +286,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);
@@ -325,8 +331,13 @@
}
if (ScoreGoods.ISQG_YES.equals(data.getIsQg())) {
- Long remain = DateUtil.between(new Date(), data.getQgEndTime(), DateUnit.SECOND, false);
- data.setRemainTime(remain);
+ if (new Date().before(data.getQgStartTime())) {
+ data.setIsStartQg(2);
+ } else {
+ data.setIsStartQg(1);
+ Long remain = DateUtil.between(new Date(), data.getQgEndTime(), DateUnit.SECOND, false);
+ data.setRemainTime(remain);
+ }
}
return data;
}
--
Gitblit v1.9.1