Merge remote-tracking branch 'origin/master'

admin

2018-12-13 f5b843b018ff6867f477e2d088e665ffef97ba35

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

@@ -571,7 +571,11 @@
            userShareGoodsGroup.setCreateTime(null);

            userShareGoodsGroup.setUpdateTime(null);

            userShareGoodsGroup.setRecordId(null);

            dataObject.put("group", gson.toJson(userShareGoodsGroup));

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

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

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

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

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

            array.add(dataObject);

         }