fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1756,10 +1756,11 @@ * @param acceptData * @param id * @param uid * @param pageSource 页面来源 * @param out */ @RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST) public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) { public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) { if ("0".equalsIgnoreCase(uid)) { uid = ""; @@ -1937,10 +1938,6 @@ goods.put("price", tb.getReservePrice().toString()); goods.put("zkPrice", tb.getZkPrice().toString()); // 红包 BigDecimal proportion = manageService.getFanLiRate(); String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion); goods.put("hongBao", hongBao); // 30天销量 goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day())); @@ -1980,13 +1977,21 @@ // 领券人列表 List<ShamUser> listCouponUser = new ArrayList<ShamUser>(); String hongBao = null; // 获取券信息 if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) { BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb); JSONObject couponInfo = new JSONObject(); couponInfo.put("couponPrice", quanPrice.toString()); if (from != null && from.equals("miandan")) { // 免单商品 hongBao = quanPrice.toString(); } // 服务端转链 if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) { couponInfo.put("couponUrl", tb.getCouponLink()); @@ -2005,7 +2010,14 @@ listCouponUser = shamUserService.listRandCouponUser(5, 1, 300); } } // 红包 if (hongBao == null) { BigDecimal proportion = manageService.getFanLiRate(); hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion); } goods.put("hongBao", hongBao); data.put("tbPidInfo", clientTBPid); String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId(); fanli/src/main/java/com/yeshi/fanli/controller/client/UserCouponController.java
@@ -160,21 +160,23 @@ * @param acceptData * @param page * @param uid * @param auctionId 商品id * @param out */ @RequestMapping(value = "getGoodsCouponList", method = RequestMethod.POST) public void getGoodsCouponList(AcceptData acceptData, Long uid, PrintWriter out) { public void getGoodsCouponList(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) { if (uid == null) { out.print(JsonUtil.loadFalseResult("用户未登录")); return; } try { List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid); List<UserSystemCouponVO> resultList = UserSystemCouponService.getGoodsCouponList(uid, auctionId); if (resultList == null ) { resultList =new ArrayList<UserSystemCouponVO>(); } JSONObject dataTip = new JSONObject(); dataTip.put("content", configService.get("free_coupon_tip")); @@ -574,13 +576,6 @@ return prize; } public static void main(String[] args) { long result = (1 + Math.round(Math.random() * (9))); System.out.println(result); } /** * 获取抽奖结果 @@ -631,7 +626,6 @@ } userInfoExtra.setLotteryNewbies(count); userInfoExtraService.saveUserInfoExtra(userInfoExtra); } else { count = lotteryNewbies; // 剩余次数 } fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -28,6 +28,7 @@ import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.system.SystemCoupon; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.exception.user.UserInfoExtraException; import com.yeshi.fanli.exception.user.UserSystemCouponException; import com.yeshi.fanli.log.LogHelper; @@ -49,7 +50,9 @@ import com.yeshi.fanli.service.inter.user.UserSystemCouponService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.order.CommonOrderVO; import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO; @@ -62,6 +65,9 @@ @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private RedisManager redisManager; @Resource private UserSystemCouponMapper userSystemCouponMapper; @@ -420,8 +426,9 @@ Integer stateActivated = userCouponVO.getStateActivated(); if (stateActivated == null || stateActivated == 0) { userCouponVO.setCouponPicture(PIC_INVALID); // 未激活 userCouponVO.setState(0); userCouponVO.setCouponEffect("待激活"); userCouponVO.setCouponPicture(PIC_INVALID); // 未激活图片 } else { userCouponVO.setCouponPicture(systemCoupon.getPicture()); } @@ -498,9 +505,14 @@ } @Override public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception { public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception { if (uid == null) { throw new UserSystemCouponException(1, "用户未登录"); } if (auctionId == null) { throw new UserSystemCouponException(1, "商品ID为空"); } // 更新过期券 @@ -514,7 +526,26 @@ return null; } return getEnableListByCouponId(uid, null, couponList); List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList); // 获取商品详情 TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId); if (taoBaoGoodsBrief != null) { BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief); // 券后价 大于10元 不能免单 if (quanPrice.compareTo(new BigDecimal(10)) > 0) { if (list != null && list.size() > 0) { for (UserSystemCouponVO userCouponVO: list) { // 显示不能使用 userCouponVO.setState(0); userCouponVO.setCouponPicture(PIC_INVALID); } } } } return list; } @Override fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponService.java
@@ -71,7 +71,7 @@ * @throws UserSystemCouponException * @throws Exception */ public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception; public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception; /** * 更新券使用记录
