Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java

@@ -4,6 +4,7 @@
import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



@@ -103,11 +104,6 @@
   @Override

   public int updateByPrimaryKeySelective(UserShareGoodsRecord record) {

      return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record);

   }



   @Override

   public int updateByPrimaryKey(UserShareGoodsRecord record) {

      return userShareGoodsRecordMapper.updateByPrimaryKey(record);

   }





@@ -266,7 +262,7 @@
    * @throws UserShareGoodsRecordException

    */

   @Override

   public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {

   public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {

      

      if (listGoods == null || listGoods.size() < 0) {

         throw new UserShareGoodsRecordException(1, "分享商品数量不足");

@@ -294,13 +290,13 @@
      userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);

      

      

      JSONObject data = new JSONObject();

      Map<String,Object> map = new HashMap<String,Object>();

      // 多个商品分享

      FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods);

      data.put("loadResult", loadResult);

      data.put("shareId", userShareGoodsRecord.getId());

      map.put("loadResult", loadResult);

      map.put("shareId", userShareGoodsRecord.getId());

      

      return data;

      return map;

   }

   

   /**

@@ -320,25 +316,20 @@
            return;

         }

         

         UserShareGoodsGroup shareGoodsGroup = null;

         

         UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),

               userShareGoodsRecord.getUid());

         if (singleGoods != null && singleGoods.getTotalGoods() == 1) {

            // 同一个商品多次分享

            shareGoodsGroup = singleGoods;

         }	
         

         if (shareGoodsGroup != null) {

         if (singleGoods != null) {

            // 单个商品多次分享

            userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());

            userShareGoodsRecord.setId(shareGoodsGroup.getRecordId());

            userShareGoodsRecord.setId(singleGoods.getRecordId());

            userShareGoodsRecord.setUpdateTime(new Date());

            userShareGoodsRecordMapper.updateByPrimaryKey(userShareGoodsRecord);

            userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);

            

            // 最新商品

            shareGoodsGroup.setUpdateTime(new Date());

            userShareGoodsGroupService.updateByPrimaryKeySelective(shareGoodsGroup);

            singleGoods.setUpdateTime(new Date());

            userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);

            

         } else 

         {

@@ -349,18 +340,17 @@
            userShareGoodsRecord.setUpdateTime(date);

            userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);

            

            shareGoodsGroup = new UserShareGoodsGroup();

            shareGoodsGroup.setTotalOrder(0);

            shareGoodsGroup.setTotalBrowse(0);

            shareGoodsGroup.setTodayBrowse(0);

            shareGoodsGroup.setTotalMoney(new BigDecimal(0));

            shareGoodsGroup.setCreateTime(date);

            shareGoodsGroup.setUpdateTime(date);

            shareGoodsGroup.setCommonGoods(resultCommonGoods);

            shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());

            singleGoods = new UserShareGoodsGroup();

            singleGoods.setTotalOrder(0);

            singleGoods.setTotalBrowse(0);

            singleGoods.setTodayBrowse(0);

            singleGoods.setTotalMoney(new BigDecimal(0));

            singleGoods.setCreateTime(date);

            singleGoods.setUpdateTime(date);

            singleGoods.setCommonGoods(resultCommonGoods);

            singleGoods.setRecordId(userShareGoodsRecord.getId());

            

				
            userShareGoodsGroupService.insertSelective(shareGoodsGroup);

            userShareGoodsGroupService.insertSelective(singleGoods);

         }

         

      } catch (CommonGoodsException e) {

@@ -437,7 +427,7 @@
      

      Long uid = shareRecord.getUid();

      Long shareId = shareRecord.getId();

      String source = shareRecord.getSource().getDesc();

      String source = shareRecord.getSource().name();

      

      String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(),

            AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "", source +"");

@@ -652,6 +642,7 @@
                            goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());

                         

                            goodsState = 0;

                            goodsBrief.setState(goodsState); // 在售

                            

                            CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);

                            upadeteCommonGoods.setState(goodsState);