admin
2021-01-25 2ba431be9c12a79783e0f9ef249292b7fa95f2a1
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -24,7 +24,6 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
@@ -37,8 +36,8 @@
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
@@ -489,7 +488,7 @@
    }
    @Override
    public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException {
    public JSONObject getGoodsGroup(Long recordId, SystemEnum system) throws UserShareGoodsRecordException {
        JSONArray array = new JSONArray();
@@ -520,7 +519,7 @@
                .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
        BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
                java.lang.System.currentTimeMillis());
                java.lang.System.currentTimeMillis(),system);
        for (UserShareGoodsGroup goodsGroup : list) {
            CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -573,7 +572,7 @@
    }
    @Override
    public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException {
    public JSONObject getGoodsGroupDetail(Long recordId, SystemEnum system) throws UserShareGoodsRecordException {
        JSONArray array = new JSONArray();
@@ -606,7 +605,7 @@
                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
            BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
                    java.lang.System.currentTimeMillis());
                    java.lang.System.currentTimeMillis(),system);
            for (UserShareGoodsGroup goodsGroup : list) {
                CommonGoods commonGoods = goodsGroup.getCommonGoods();