前端是否该显示分享记录与选品库

admin

2019-01-05 0338c241f0a5a7606b12c4f55b699976a91cff91

前端是否该显示分享记录与选品库

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java

@@ -30,6 +30,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;

import com.yeshi.fanli.service.inter.config.SystemService;

import com.yeshi.fanli.service.inter.goods.ShareGoodsService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

@@ -44,9 +45,11 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ExtractService;

import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -74,7 +77,7 @@


    @Resource

    private HongBaoService hongBaoService;

	


    @Resource

    private HongBaoV2Service hongBaoV2Service;



@@ -128,6 +131,12 @@


    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;



    @Resource

    private SpreadUserImgService spreadUserImgService;



    @Resource

    private UserShareGoodsRecordService userShareGoodsRecordService;



    private static final String PASSWORD_MAX_ERROR = "password_max_error";

    private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -839,6 +848,7 @@
     */

    @RequestMapping(value = "getusermoney")

    public void getMoneyDetail(AcceptData acceptData, Long uid, PrintWriter out) {



        UserInfo user = userInfoService.getUserByIdWithMybatis(uid);

        if (user == null) {

            out.print(JsonUtil.loadFalseResult(2, "用户不存在"));

@@ -857,29 +867,39 @@
        BigDecimal unOpenmoney = hongBaoV2Service.getUnRecievedFanLiMoney(uid);

        BigDecimal totalFanMoney = hongBaoV2Service.getTotalFanLiMoney(uid);

        JSONObject data = new JSONObject();

        int spreadImgCount = spreadUserImgService.countUserSpreadImg(uid);

        long shareCount = userShareGoodsRecordService.countShareRecordByUid(uid);



        // IOS端数字按照字符串处理

        if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 33) {

            data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN).toString());

            data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN).toString());

            data.put("moneyLastMonth", moneyLastMonth.toString());

            data.put("money", user.getMyHongBao().toString());

            data.put("unGetMoney", unOpenmoney.toString());

            data.put("totalFanLiMoney", totalFanMoney.toString());// 累计返利

            data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).toString());// 累计提成

            data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).toString()); // 未到账提成

            data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN).toString());

            data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN).toString());

            data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN).toString());

            data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());// 累计返利

            data.put("totalTiChengMoney",

                    hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString());// 累计提成

            data.put("totalUnGetTiChengMoney",

                    hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 未到账提成

            // 展示提成数据

            data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);

            if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))

                data.put("showTiCheng", false);

            else

                data.put("showTiCheng", spreadImgCount + shareCount > 0);

        } else {

            data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("moneyLastMonth", moneyLastMonth);

            data.put("money", user.getMyHongBao());

            data.put("unGetMoney", unOpenmoney);

            data.put("totalFanLiMoney", totalFanMoney);// 累计返利

            data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid));// 累计提成

            data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid)); // 未到账提成

            data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN));

            data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN));

            data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN));// 累计返利

            data.put("totalTiChengMoney",

                    hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN));// 累计提成

            data.put("totalUnGetTiChengMoney",

                    hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN)); // 未到账提成

            // 展示提成数据

            data.put("showTiCheng", hongBaoV2Service.getTotalTiChengCount(uid) > 0);

            data.put("showTiCheng", spreadImgCount + shareCount > 0);

        }



        user.setNoOpenHongBao(unOpenmoney);


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/share/UserShareGoodsRecordMapper.java

@@ -19,31 +19,34 @@
    int updateByPrimaryKeySelective(UserShareGoodsRecord record);

    int updateByPrimaryKey(UserShareGoodsRecord record);
	

    /**
     * 查询用户对应的分享记录
     * 
     * @param start
     * @param count
     * @param uid
     * @return
     */
    List<UserShareGoodsRecord> listQueryByUid(@Param("start") long start, @Param("count") int count, 
    List<UserShareGoodsRecord> listQueryByUid(@Param("start") long start, @Param("count") int count,
            @Param("uid") Long uid, @Param("source") String source);
	

    long countQueryByUid(@Param("uid") Long uid, @Param("source") String source);
	

    /**
     * 统计记录
     * 
     * @param list
     * @return
     */
    List<UserShareGoodsRecord> listCountRecord(@Param("list") List<Long> list);
	

    /**
     * 统计今日浏览记录
     * 
     * @param list
     * @return
     */
    List<UserShareGoodsRecord> listCountTodayBrowse(@Param("list") List<Long> list);
	

}

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

@@ -236,4 +236,10 @@
        return null;

    }



    @Override

    public int countUserSpreadImg(Long uid) {



        return (int) (spreadUserImgDao.getCount("select count(*) from SpreadUserImg u where u.uid=" + uid));

    }



}


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

@@ -61,31 +61,31 @@


    @Resource(name = "taskExecutor")

    private TaskExecutor executor;

	


    @Resource

    private ConfigService configService;

	


    @Resource

    private RedisManager redisManager;

	


    @Resource

    private UserInfoMapper userInfoMapper;

	


    @Resource

    private UserAccountService userAccountService;

	


    @Resource

    private UserShareGoodsRecordMapper userShareGoodsRecordMapper;

	


    @Resource

    private CommonGoodsService commonGoodsService;

	


    @Resource

    private UserShareGoodsGroupService userShareGoodsGroupService;

	


    @Resource

    private HongBaoManageService hongBaoManageService;

	


    @Resource

    private UserGoodsStorageService userGoodsStorageService;



@@ -109,7 +109,6 @@
        return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record);

    }





    @Override

    public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source) {

        return userShareGoodsRecordMapper.listQueryByUid(start, count, uid, source);

@@ -119,53 +118,51 @@
    public long countQueryByUid(Long uid, String source) {

        return userShareGoodsRecordMapper.countQueryByUid(uid, source);

    }

	
	


    @Override

    public List<UserShareGoodsRecord> listCountRecord(List<Long> list) {

        return userShareGoodsRecordMapper.listCountRecord(list);

    }

	


    @Override

    public List<UserShareGoodsRecord> getMyShareGoodsRecords(long start, int count, Long uid, String source) {

		


        List<UserShareGoodsRecord> list = listQueryByUid(start, count, uid, source);

        if (list == null) {

            list = new ArrayList<UserShareGoodsRecord>();

        }

		


        if (list.size() > 0) {

            List<Long> listId = new ArrayList<Long>();

			
            for (UserShareGoodsRecord userShareGoodsRecord: list) {



            for (UserShareGoodsRecord userShareGoodsRecord : list) {

                userShareGoodsRecord.setShareTime(userShareGoodsRecord.getUpdateTime().getTime());

                userShareGoodsRecord.setCreateTime(null);

                userShareGoodsRecord.setUpdateTime(null);

                listId.add(userShareGoodsRecord.getId());

				


                // 改变图片尺寸

                String pictUrl = userShareGoodsRecord.getPicture();

                if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {

                    userShareGoodsRecord.setPicture(TbImgUtil.getTBSize320Img(pictUrl));

                }

				
				


            }

			


            // 今日浏览统计

            List<UserShareGoodsRecord> listTodayBrowse= userShareGoodsRecordMapper.listCountTodayBrowse(listId);

			
            List<UserShareGoodsRecord> listTodayBrowse = userShareGoodsRecordMapper.listCountTodayBrowse(listId);



            // 订单、浏览数量、金额统计

            List<UserShareGoodsRecord> listCountRecord = listCountRecord(listId);

			


            if ((listCountRecord != null && listCountRecord.size() > 0)

                || (listTodayBrowse != null && listTodayBrowse.size() > 0)) {

				
                for (UserShareGoodsRecord shareRecord: list) {

                    Long id = shareRecord.getId() ;

					
                    if (listTodayBrowse != null && listTodayBrowse.size() > 0){

                        for (UserShareGoodsRecord goodsRecord: listTodayBrowse) {

                    || (listTodayBrowse != null && listTodayBrowse.size() > 0)) {



                for (UserShareGoodsRecord shareRecord : list) {

                    Long id = shareRecord.getId();



                    if (listTodayBrowse != null && listTodayBrowse.size() > 0) {

                        for (UserShareGoodsRecord goodsRecord : listTodayBrowse) {

                            Long recordId = goodsRecord.getId();

                            if (id == recordId || id.equals(recordId)) {

                                shareRecord.setTodayBrowse(goodsRecord.getTodayBrowse());

@@ -173,23 +170,22 @@
                            }

                        }

                    }

					


                    if (listCountRecord != null && listCountRecord.size() > 0) {

                        for (UserShareGoodsRecord goodsRecord: listCountRecord) {

                        for (UserShareGoodsRecord goodsRecord : listCountRecord) {

                            Long recordId = goodsRecord.getId();

                            if (id == recordId || id.equals(recordId)) {

                                shareRecord.setTotalBrowse(goodsRecord.getTotalBrowse());

                                shareRecord.setTotalOrder(goodsRecord.getTotalOrder());

								


                                BigDecimal totalMoney = goodsRecord.getTotalMoney();

                                if (totalMoney != null && totalMoney.compareTo(new BigDecimal(0))>0 ) {

                                if (totalMoney != null && totalMoney.compareTo(new BigDecimal(0)) > 0) {

                                    shareRecord.setTotalMoney(goodsRecord.getTotalMoney());

                                } else {

                                    shareRecord.setTotalMoney(goodsRecord.getRevenueMoney());

                                }

                                shareRecord.setRevenueMoney(null);

								
								


                                Integer totalGoods = goodsRecord.getTotalGoods();

                                shareRecord.setTotalGoods(totalGoods);

                                if (totalGoods > 1) {

@@ -204,29 +200,28 @@
                }

            }

        }

		


        return list;

    }

	


    @Override

    public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException {

		


        if (auctionId == null) {

            throw new UserShareGoodsRecordException(1, "分享商品不能为空");

        }

		


        if (uid == null) {

            throw new UserShareGoodsRecordException(1, "用户ID不能为空");

        }

		


        TaoBaoGoodsBrief goodsBrief = null;

        try {

            goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

        } catch (TaobaoGoodsDownException e) {

            throw new UserShareGoodsRecordException(1, "商品已下架");

        }

		


        UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();

        userShareGoodsRecord.setUid(uid);

        userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);

@@ -234,22 +229,23 @@
        // 单个商品分享

        singleGoodsShare(userShareGoodsRecord, goodsBrief);

    }

	


    @Override

    public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException {

		
    public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)

            throws UserShareGoodsRecordException {



        if (taoBaoGoodsBrief == null) {

            throw new UserShareGoodsRecordException(1, "分享商品不能为空");

        }

		


        if (uid == null) {

            throw new UserShareGoodsRecordException(1, "用户ID不能为空");

        }

		


        if (source == null) {

            throw new UserShareGoodsRecordException(1, "分享来源不能为空");

        }

		


        UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();

        userShareGoodsRecord.setUid(uid);

        userShareGoodsRecord.setSource(source);

@@ -257,92 +253,92 @@
        // 单个商品分享

        singleGoodsShare(userShareGoodsRecord, taoBaoGoodsBrief);

    }

	
	


    /**

     * 保存分享记录

     * @param userShareGoodsRecord 分享记录： uid、picture、source 为必输入

     * 
     * @param userShareGoodsRecord

     *            分享记录： uid、picture、source 为必输入

     * @throws UserShareGoodsRecordException

     */

    @Override

    public Map<String,Object> 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, "分享商品数量不足");

        }

		


        if (uid == null) {

            throw new UserShareGoodsRecordException(1, "用户ID不能为空");

        }

		


        if (source == null) {

            throw new UserShareGoodsRecordException(1, "分享来源不能为空");

        }

		


        UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();

        userShareGoodsRecord.setUid(uid);

        userShareGoodsRecord.setSource(source);

        userShareGoodsRecord.setTitle(title);

        // 取一个商品图片作为主图

        userShareGoodsRecord.setPicture(listGoods.get(0).getPictUrl());

		


        Date date = new Date();

        userShareGoodsRecord.setShareState(0); // 初始未分享

        userShareGoodsRecord.setCreateTime(date);

        userShareGoodsRecord.setUpdateTime(date);

        userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);

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



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

        // 多个商品分享

        FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods);

        map.put("loadResult", loadResult);

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

		


        return map;

    }

	


    /**

     * 单个商品分享生成记录

     * 
     * @param userShareGoodsRecord

     * @param taoBaoGoodsBrief

     */

    @Transactional

    public void singleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, TaoBaoGoodsBrief taoBaoGoodsBrief) {

	


        CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief);

        commonGoods.setState(taoBaoGoodsBrief.getState());

        try {

            CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);

			


            if (resultCommonGoods == null) {

                return;

            }

			
			


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

                    userShareGoodsRecord.getUid());

			


            if (singleGoods != null) {

                // 单个商品多次分享

                userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());

                userShareGoodsRecord.setId(singleGoods.getRecordId());

                userShareGoodsRecord.setUpdateTime(new Date());

                userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);

				


                // 最新商品

                singleGoods.setUpdateTime(new Date());

                userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);

				
            } else 
            {



            } else {

                // 单个商品第一次分享

                Date date = new Date();

                userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());

                userShareGoodsRecord.setCreateTime(date);

                userShareGoodsRecord.setUpdateTime(date);

                userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);

				


                singleGoods = new UserShareGoodsGroup();

                singleGoods.setTotalOrder(0);

                singleGoods.setTotalBrowse(0);

@@ -352,42 +348,43 @@
                singleGoods.setUpdateTime(date);

                singleGoods.setCommonGoods(resultCommonGoods);

                singleGoods.setRecordId(userShareGoodsRecord.getId());

				


                userShareGoodsGroupService.insertSelective(singleGoods);

            }

			


        } catch (CommonGoodsException e) {

            e.printStackTrace();

        }

		


    }

	
	


    /**

     * 多个商品分享生成记录

     * 
     * @param userShareGoodsRecord

     * @param listGoods

     */

    @Transactional

    public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {

		
    public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord,

            List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {



        // 分享记录

        Date date = new Date();

		


        List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();

        List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();

		
        for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoods) {



        for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {

            CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief);

            commonGoods.setState(taoBaoGoodsBrief.getState());

            try {

                CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);

			


                if (resultCommonGoods != null) {

                    TaoBaoGoodsBrief goodsBrief =  TaoBaoUtil.convert(resultCommonGoods);

                    TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(resultCommonGoods);

                    listGoodsBrief.add(goodsBrief);

                }

				


                UserShareGoodsGroup shareGoodsGroup = new UserShareGoodsGroup();

                shareGoodsGroup.setTotalOrder(0);

                shareGoodsGroup.setTotalBrowse(0);

@@ -397,44 +394,48 @@
                shareGoodsGroup.setUpdateTime(date);

                shareGoodsGroup.setCommonGoods(resultCommonGoods);

                shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());

				
				


                listGroup.add(shareGoodsGroup);

				


            } catch (CommonGoodsException e) {

                e.printStackTrace();

                continue;

            }

        }

		


        FileUploadResult shareImg = createShareImg(userShareGoodsRecord, listGoodsBrief);

		


        if (listGroup.size() > 0) {

            userShareGoodsGroupService.insertBatch(listGroup);

        }

		


        return shareImg;

    }

	


    /**

     * 生成分享图

     * @param uid 用户id

     * @param shareId 分享记录id

     * @param source  来源

     * 
     * @param uid

     *            用户id

     * @param shareId

     *            分享记录id

     * @param source

     *            来源

     * @param listGoods

     * @return

     * @throws UserShareGoodsRecordException

     */

    public FileUploadResult createShareImg (UserShareGoodsRecord shareRecord, List<TaoBaoGoodsBrief> listGoods) 
            throws UserShareGoodsRecordException{

		
    public FileUploadResult createShareImg(UserShareGoodsRecord shareRecord, List<TaoBaoGoodsBrief> listGoods)

            throws UserShareGoodsRecordException {



        Long uid = shareRecord.getUid();

        Long shareId = shareRecord.getId();

        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 +"");

		


        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 + "");



        String shortLink = HttpUtil.getShortLink(url);

        if (!StringUtil.isNullOrEmpty(shortLink)) {

            url = shortLink;

@@ -447,15 +448,15 @@
        } catch (Exception e) {

            e.printStackTrace();

        }

		


        // 获取到用户的头像

        UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

        if (user == null) {

            throw new UserShareGoodsRecordException(1, "用户信息不存在");

        }

		


        InputStream portrait = null;

	


        if (!StringUtil.isNullOrEmpty(user.getPortrait())) {

            try {

                portrait = HttpUtil.downLoadImg(user.getPortrait());

@@ -473,23 +474,22 @@
                }

            }

        }

		


        InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);

		


        FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,

                "sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");

	


        return shareImg;

    }

	
	


    @Override

    public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException {

		


        JSONArray array = new JSONArray();



        List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);

		


        List<Long> listGid = new ArrayList<Long>();

        for (UserShareGoodsGroup goodsGroup : list) {

            CommonGoods commonGoods = goodsGroup.getCommonGoods();

@@ -498,7 +498,7 @@
            }

            listGid.add(commonGoods.getGoodsId());

        }

		


        // API网络接口验证是否在售

        List<TaoBaoGoodsBrief> listTaoKeGoods = null;

        try {

@@ -510,23 +510,22 @@
        } catch (Exception e) {

            e.printStackTrace();

        }

		


        Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



        BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());

		


        for (UserShareGoodsGroup goodsGroup : list) {

            CommonGoods commonGoods = goodsGroup.getCommonGoods();

            if (commonGoods == null) {

                continue;

            }

			
            if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 ) {

                int state = 1;  // 默认停售



            if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {

                int state = 1; // 默认停售

                Long goodsId = commonGoods.getGoodsId();

                for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {

                for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {

                    Long auctionId = taoKeGoods.getAuctionId();

                    if (goodsId == auctionId || goodsId.equals(auctionId)) {

                        state = 0; // 在售

@@ -535,32 +534,31 @@
                }

                commonGoods.setState(state);

            }

			


            TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

			


            // 今日浏览记录处理

            Date date = new Date();

            Date browseTime = goodsGroup.getBrowseTime();

            if (!DateUtil.isSameDay(browseTime, date)) {

                goodsGroup.setTodayBrowse(0); // 不是同一天浏览记录设置0

            }

			
			


            JSONObject dataObject = new JSONObject();

            dataObject.put("todayBrowse",goodsGroup.getTodayBrowse() );

            dataObject.put("totalBrowse",goodsGroup.getTotalBrowse() );

            dataObject.put("todayBrowse", goodsGroup.getTodayBrowse());

            dataObject.put("totalBrowse", goodsGroup.getTotalBrowse());

            dataObject.put("totalOrder", goodsGroup.getTotalOrder());

            dataObject.put("totalMoney", "¥"+goodsGroup.getTotalMoney());

            dataObject.put("goods", gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate+"", null)));

            dataObject.put("totalMoney", "¥" + goodsGroup.getTotalMoney());

            dataObject.put("goods", gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate + "", null)));

            array.add(dataObject);

        }

		


        String title = "";

        UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId);

        if(userShareGoodsRecord != null) {

        if (userShareGoodsRecord != null) {

            title = userShareGoodsRecord.getTitle();

        }

		


        JSONObject data = new JSONObject();

        data.put("title", title);

        data.put("count", list.size());

@@ -568,14 +566,13 @@
        return data;

    }



	
    @Override

    public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException {

		


        JSONArray array = new JSONArray();

		


        List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);

		


        if (list != null && list.size() > 0) {



            List<Long> listGid = new ArrayList<Long>();

@@ -586,7 +583,7 @@
                }

                listGid.add(commonGoods.getGoodsId());

            }

			


            // API网络接口验证是否在售

            List<TaoBaoGoodsBrief> listTaoKeGoods = null;

            try {

@@ -598,23 +595,22 @@
            } catch (Exception e) {

                e.printStackTrace();

            }

			
			


            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

			


            BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());

			


            for (UserShareGoodsGroup goodsGroup : list) {

                CommonGoods commonGoods = goodsGroup.getCommonGoods();

                if (commonGoods == null) {

                    continue;

                }

				
                if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 ) {

                    int state = 1;  // 默认停售



                if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {

                    int state = 1; // 默认停售

                    Long goodsId = commonGoods.getGoodsId();

                    for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {

                    for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {

                        Long auctionId = taoKeGoods.getAuctionId();

                        if (goodsId == auctionId || goodsId.equals(auctionId)) {

                            state = 0; // 在售

@@ -623,43 +619,51 @@
                    }

                    commonGoods.setState(state);

                }

				


                TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

				


                if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {

                    goodsBrief.setState(1); // 已抢光

                }

				
                TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate +"", null);

                    goodsBrief.setState(1); // 已抢光

                }



                TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,

                        shareRate + "", null);

                array.add(gson.toJson(taoBaoGoodsBriefExtra));

            }



        }

		


        String title = "";

        UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId);

        if(userShareGoodsRecord != null) {

        if (userShareGoodsRecord != null) {

            title = userShareGoodsRecord.getTitle();

        }

		


        JSONObject data = new JSONObject();

        data.put("title", title);

        data.put("count", list.size());

        data.put("result_list", array);

		


        return data;

    }



    @Override

    public void updateShareRecord (Long shareId) throws UserShareGoodsRecordException {

    public void updateShareRecord(Long shareId) throws UserShareGoodsRecordException {

        UserShareGoodsRecord shareRecord = userShareGoodsRecordMapper.selectByPrimaryKey(shareId);

        if (shareRecord == null) {

            throw new UserShareGoodsRecordException(1, "分享记录不存在");

        }

		


        shareRecord.setShareState(1);// 分享生效

        updateByPrimaryKeySelective(shareRecord);

        // 更新商品为已分享

        userGoodsStorageService.updateShareState(shareId);

    }



    @Override

    public long countShareRecordByUid(Long uid) {



        return userShareGoodsRecordMapper.countQueryByUid(uid, null);



    }

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/SpreadUserImgService.java

@@ -21,6 +21,13 @@
    List<String> getUserSpreadImg(Long uid);



    /**

     * 用户分享图的数量

     * @param uid

     * @return

     */

    int countUserSpreadImg(Long uid);



    /**

     * 获取以某张图片为背景的邀请分享图

     * 

     * @param uid


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java

@@ -19,29 +19,30 @@
    public int updateByPrimaryKeySelective(UserShareGoodsRecord record);



    public UserShareGoodsRecord selectByPrimaryKey(Long id);

	


    /**

     * 查询用户对应的选品库

     * 
     * @param start

     * @param count

     * @param uid

     * @return

     */

    public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source);

	
    public long countQueryByUid(Long uid, String source);



    public long countQueryByUid(Long uid, String source);



    /**

     * 统计记录

     * 
     * @param list

     * @return

     */

    public List<UserShareGoodsRecord> listCountRecord(List<Long> list);



	
    /**

     * 获取分享记录

     * 
     * @param start

     * @param count

     * @param uid

@@ -52,28 +53,37 @@


    /**

     * 多个商品分享

     * @param uid 用户id

     * @param source 来源

     * @param title 标题内容

     * @param listGoods 商品集合

     * 
     * @param uid

     *            用户id

     * @param source

     *            来源

     * @param title

     *            标题内容

     * @param listGoods

     *            商品集合

     * @throws UserShareGoodsRecordException

     */

    public Map<String,Object> 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;



    /**

     * 单个商品分享

     * @param uid 用户id

     * @param source 来源

     * @param taoBaoGoodsBrief 商品

     * 
     * @param uid

     *            用户id

     * @param source

     *            来源

     * @param taoBaoGoodsBrief

     *            商品

     * @throws UserShareGoodsRecordException

     */

    public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)

            throws UserShareGoodsRecordException;

	
	


    /**

     * 查询已分享商品

     * 
     * @param recordId

     * @return

     * @throws UserShareGoodsRecordException

@@ -82,6 +92,7 @@


    /**

     * h5分享商品列表

     * 
     * @param recordId

     * @return

     * @throws UserShareGoodsRecordException

@@ -90,6 +101,7 @@


    /**

     * 更新分享记录

     * 
     * @param shareId

     * @throws UserShareGoodsRecordException

     */

@@ -104,4 +116,11 @@
     */

    public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException;



    /**

     * 分享记录计数

     * @param uid

     * @return

     */

    public long countShareRecordByUid(Long uid);



}