返利比例与会员比例调整

admin

2019-12-10 d3db196ed2fe8b6c3905ff111d665d9fc2c951a3

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java

@@ -50,8 +50,10 @@
    * 分享商品详情

    * 

    * @param callback

    * @param shareId  分享id

    * @param source   来源

    * @param shareId

    *            分享id

    * @param source

    *            来源

    * @param out

    */

   @RequestMapping(value = "getDetail")

@@ -78,8 +80,10 @@
    * 分享商品列表

    * 

    * @param callback

    * @param shareId  分享id

    * @param source   来源

    * @param shareId

    *            分享id

    * @param source

    *            来源

    * @param out

    */

   @RequestMapping(value = "getList")

@@ -145,7 +149,6 @@
               }

            }

            

				
            // 拼多多验证是否在售

            List<PDDGoodsDetail> listPDD = null;

            if (listIdPDD.size() > 0) {

@@ -164,12 +167,12 @@
               }

            }

            

				
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);

            ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,

                  hongBaoManageService.getVIPFanLiRate());

            for (UserShareGoodsGroup goodsGroup : list) {

               CommonGoods commonGoods = goodsGroup.getCommonGoods();

               if (commonGoods == null) {

@@ -205,7 +208,6 @@
                  commonGoods.setState(state);

               }

               

					
               if (goodsType == Constant.SOURCE_TYPE_PDD && listPDD != null && listPDD.size() > 0) {

                  int state = 1; // 默认停售

                  for (PDDGoodsDetail goodsDetail : listPDD) {

@@ -219,7 +221,8 @@
               }

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

               if (!detailVO.isHasCoupon()) {

                  detailVO.setState(1);; // 已抢光

                  detailVO.setState(1);

                  ; // 已抢光

               }

               array.add(gson.toJson(detailVO));

            }