喻健
2018-12-19 9f09e749e7198051b9af6c2421336a80b58b79a4
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -326,12 +327,26 @@
         throw new UserGoodsStorageException(1, "选品库商品不存在");
      }
      
      List<UserGoodsStorage> listResult = new ArrayList<UserGoodsStorage>();
      // 还原顺序 用于制图
      for (Long sid: listStorageID) {
         for (UserGoodsStorage torage: listStorage) {
            Long id = torage.getId();
            if (sid == id || sid.equals(id)) {
               listResult.add(torage);
               break;
            }
         }
      }
      BigDecimal totalMoney = new BigDecimal(0.00);
      List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
      
      String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
      
      for (UserGoodsStorage userGoodsStorage: listStorage) {
      for (UserGoodsStorage userGoodsStorage: listResult) {
         CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
         listGoodsBrief.add(goodsBrief);
@@ -342,14 +357,14 @@
      
      String revenue = listGoodsBrief.size() + "个商品预估分享奖金:¥"+totalMoney;
      
      JSONObject result = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
      Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
            null, listGoodsBrief);
      
      JSONObject data = new JSONObject();
      data.put("revenue", revenue);
      data.put("shareId", result.get("shareId"));
      data.put("shareImg", result.get("loadResult"));
      data.put("notifyDesc", configService.get("goods_share_notify"));
      data.put("shareId", map.get("shareId"));
      data.put("shareImg", map.get("loadResult"));
      data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
      return data;
   }