订单奖励修改

admin

2019-10-22 32f925357776c46bd9e35cf9aad4fdd0f6535d1d

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

@@ -16,11 +16,13 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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.taobao.TaoBaoGoodsBrief;

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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.factory.goods.GoodsDetailVOFactory;

@@ -46,6 +48,9 @@


   @Resource

   private UserSystemCouponService userSystemCouponService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @RequestMapping("getMianDanGoodsList")

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

@@ -165,7 +170,9 @@
         return;

      }

      // 获取免单券数量

      long couponCount = userSystemCouponService.count

      long couponCount = userSystemCouponService.countUsableRewardCoupon(uid);

      UserInfoExtra extraInfo=userInfoExtraService.getUserInfoExtra(uid);

      long integralCount=extraInfo!=null?extraInfo.getGoldCoin():0L;

      JSONObject userJson = new JSONObject();

      userJson.put("nickName", user.getNickName());

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

@@ -174,6 +181,7 @@
      JSONObject data = new JSONObject();

      data.put("user", userJson);

      data.put("couponCount", couponCount);

      data.put("integralCount", integralCount);

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }