好单库转链支持

admin

2020-06-15 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c

 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ScanHistoryV2ServiceImpl.java

@@ -9,6 +9,7 @@


import com.yeshi.fanli.dao.mybatis.goods.ScanHistoryV2Mapper;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.suning.SuningGoodsInfo;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.goods.CommonGoods;

@@ -39,6 +40,21 @@
         throw new ScanHistoryException(1, "设备或用户信息缺失");



      CommonGoods commonGoods = CommonGoodsFactory.create(goods);

      addScanHistory(commonGoods, device, uid);

   }



   @Override

   public void addSuningScanHistory(Long uid, String device, SuningGoodsInfo suningGoods)

         throws CommonGoodsException, ScanHistoryException {

      if (uid == null && StringUtil.isNullOrEmpty(device))

         throw new ScanHistoryException(1, "设备或用户信息缺失");



      CommonGoods commonGoods = CommonGoodsFactory.create(suningGoods);

      addScanHistory(commonGoods, device, uid);

   }



   private void addScanHistory(CommonGoods commonGoods, String device, Long uid)

         throws CommonGoodsException, ScanHistoryException {

      commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);

      if (commonGoods == null)

         throw new CommonGoodsException(2, "商品信息不完整");

@@ -87,21 +103,7 @@
         throw new ScanHistoryException(1, "设备或用户信息缺失");



      CommonGoods commonGoods = CommonGoodsFactory.create(goods);

      commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);

      if (commonGoods == null)

         throw new CommonGoodsException(2, "商品信息不完整");



      // 添加浏览记录

      ScanHistoryV2 scanHistoryV2 = new ScanHistoryV2();

      scanHistoryV2.setCommonGoods(commonGoods);

      scanHistoryV2.setCreateTime(new Date());

      scanHistoryV2.setDevice(device);



      if (uid != null)

         scanHistoryV2.setUserInfo(new UserInfo(uid));



      scanHistoryV2.setUpdateTime(new Date());

      scanHistoryV2Mapper.insertSelective(scanHistoryV2);

      addScanHistory(commonGoods, device, uid);

   }



   @Override

@@ -111,21 +113,7 @@
         throw new ScanHistoryException(1, "设备或用户信息缺失");



      CommonGoods commonGoods = CommonGoodsFactory.create(pddGoods);

      commonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);

      if (commonGoods == null)

         throw new CommonGoodsException(2, "商品信息不完整");



      // 添加浏览记录

      ScanHistoryV2 scanHistoryV2 = new ScanHistoryV2();

      scanHistoryV2.setCommonGoods(commonGoods);

      scanHistoryV2.setCreateTime(new Date());

      scanHistoryV2.setDevice(device);



      if (uid != null)

         scanHistoryV2.setUserInfo(new UserInfo(uid));



      scanHistoryV2.setUpdateTime(new Date());

      scanHistoryV2Mapper.insertSelective(scanHistoryV2);

      addScanHistory(commonGoods, device, uid);

   }



   @Override

@@ -144,17 +132,18 @@


   @Override

   public List<ScanHistoryV2> getScanHistoryByDeviceOrUid(Long uid, String device, int page, int pageSize,

         Integer source) {

         Integer source, boolean notBackSuVip) {

      if (uid == null && StringUtil.isNullOrEmpty(device))

         return null;

      return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source);

      return scanHistoryV2Mapper.selectByDeviceOrUid(uid, device, (page - 1) * pageSize, pageSize, source,

            notBackSuVip);

   }



   @Override

   public long getCountByDeviceOrUid(Long uid, String device, Integer source) {

   public long getCountByDeviceOrUid(Long uid, String device, Integer source, boolean notBackSuVip) {

      if (uid == null && StringUtil.isNullOrEmpty(device))

         return 0;

      Long count = scanHistoryV2Mapper.selectCountByDeviceOrUid(uid, device, source);

      Long count = scanHistoryV2Mapper.selectCountByDeviceOrUid(uid, device, source, notBackSuVip);

      return count == null ? 0 : count;

   }