淘礼金功能完善

admin

2021-05-21 84dd8c1579ea198aff6ca8afac05a5e8f6af9faf

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java

@@ -9,6 +9,7 @@

import javax.annotation.Resource;

import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -59,7 +60,6 @@
 * 用户相关商品
 * 
 * @author Administrator
 *
 */
@Controller
@RequestMapping("api/v2/consumer")
@@ -88,6 +88,9 @@

   @Resource
   private RedisManager redisManager;

    @Resource
    private GoodsLijinMnager goodsLijinMnager;

   /**
    * 收藏商品
@@ -272,6 +275,9 @@
         GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
               acceptData.getVersion(),acceptData.getSystem());


            List<CommonGoods> commonGoodsList=new ArrayList<>();

         for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
            CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
            if (commonGoods == null) {
@@ -292,12 +298,11 @@
               commonGoods.setState(state);
            }

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
            detailVO.setId(commonGoods.getId());
            detailVO.setCreatetime(collectionGoodsV2.getCreateTime());
            list.add(detailVO);
                commonGoods.setCreateTime(collectionGoodsV2.getCreateTime());
                commonGoodsList.add(commonGoods);
         }

            list=goodsLijinMnager.loadCommonGoodsMoneyInfo(acceptData.getSystem(),uid,commonGoodsList,paramsDTO);
      }

      GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@@ -386,6 +391,7 @@
      long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, notBackSuVip);

      JSONArray array = new JSONArray();
        List<CommonGoods> commonGoodsList = new ArrayList<>();
      if (list != null && list.size() > 0) {
         Gson gson = gsonBuilder.create();
         GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
@@ -395,12 +401,12 @@
            if (commonGoods == null) {
               continue;
            }

            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);

            detailVO.setId(commonGoods.getId());
            detailVO.setCreatetime(sh.getCreateTime());
            array.add(gson.toJson(detailVO));
                commonGoods.setCreateTime(sh.getCreateTime());
                commonGoodsList.add(commonGoods);
            }
            List<GoodsDetailVO> goodsDetailVOS = goodsLijinMnager.loadCommonGoodsMoneyInfo(acceptData.getSystem(), uid, commonGoodsList, paramsDTO);
            for (GoodsDetailVO vo : goodsDetailVOS) {
                array.add(gson.toJson(vo));
         }
      }