Administrator
2018-12-15 b96fb4b8f6abe926f956f227a121dad8c6af7317
分享图返回格式调整
4个文件已修改
37 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -170,8 +171,8 @@
            throw new ActivityException(1, "商品下架");
        }
        
        JSONObject resultdata =  userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title, listGoodsBrief);
        imgList.add((FileUploadResult) resultdata.get("loadResult"));
        Map<String,Object> map =  userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title, listGoodsBrief);
        imgList.add((FileUploadResult) map.get("loadResult"));
        result.setImgList(imgList);
        
        return result;
@@ -237,12 +238,11 @@
        
        JSONObject data = new JSONObject();
        
        JSONObject resultdata = userShareGoodsRecordService.save(uid,
                ShareSourceTypeEnum.activity, title, listGoodsBrief);
        Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.activity, title, listGoodsBrief);
        
        data.put("revenue", revenue);
        data.put("shareId", resultdata.get("shareId"));
        data.put("shareImg", resultdata.get("loadResult"));
        data.put("shareId", map.get("shareId"));
        data.put("shareImg", map.get("loadResult"));
        data.put("notifyDesc", configService.get("goods_share_notify"));
        return data;
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;
@@ -354,19 +355,15 @@
            totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
        }
        
        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("shareId", map.get("shareId"));
        data.put("shareImg", map.get("loadResult"));
        data.put("notifyDesc", configService.get("goods_share_notify"));
        return data;
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;
@@ -261,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, "分享商品数量不足");
@@ -289,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;
    }
    
    /**
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.inter.user;
import java.util.List;
import java.util.Map;
import net.sf.json.JSONObject;
@@ -57,7 +58,7 @@
     * @param listGoods 商品集合
     * @throws UserShareGoodsRecordException
     */
    public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
    public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
            throws UserShareGoodsRecordException;
    /**