From ee26d58531067afff8e036efa93cb0d57a773250 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 十二月 2018 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index 8e9e130..c63fe75 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -7,18 +7,15 @@
import javax.annotation.Resource;
import javax.transaction.Transactional;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Service;
-import org.yeshi.utils.HttpUtil;
import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
@@ -26,7 +23,6 @@
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
-import com.yeshi.fanli.util.factory.IOSPushFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@Service
@@ -97,7 +93,7 @@
} else {
// 淇敼
record.setUpdateTime(new Date());
- pushGoodsMapper.insertSelective(record);
+ pushGoodsMapper.updateByPrimaryKeySelective(record);
}
// 澶勭悊鍟嗗搧淇℃伅
--
Gitblit v1.8.0