Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java

@@ -18,16 +18,17 @@
import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

@@ -44,7 +45,7 @@
   private QualityGoodsService qualityGoodsService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private UserInfoService userInfoService;

@@ -54,6 +55,9 @@


   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserVIPInfoService userVIPInfoService;



   @RequestMapping("getMianDanGoodsList")

   public void getMianDanGoodsList(AcceptData acceptData, PrintWriter out, int page, int pageSize, String callback) {

@@ -88,8 +92,8 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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



      ConfigParamsDTO configParamsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

      ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion(),UserLevelEnum.daRen);

      /* 遍历列表数据 */

      for (QualityFactory selectionGoods : listQuery) {



@@ -180,6 +184,7 @@
      userJson.put("nickName", user.getNickName());

      userJson.put("portrait", user.getPortrait());

      userJson.put("id", user.getId());

      userJson.put("vip", userVIPInfoService.isVIP(user.getId()));



      JSONObject data = new JSONObject();

      data.put("user", userJson);

@@ -188,4 +193,4 @@
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }



}

}