Merge branch 'sts_api' into pre

netflix-dao/src/main/java/com/cyksj/model/views/UserBenefitsFrontView.java

@@ -125,6 +125,18 @@ public class UserBenefitsFrontView {
 	@DbIgnore
 	private List<CouponView> couponViews;
 
+	/**
+	 * 是否发放API站额度券
+	 */
+	@DbIgnore
+	private Boolean apiQuotaCouponEnabled;
+
+	/**
+	 * API站额度券额度
+	 */
+	@DbIgnore
+	private Integer apiQuotaCouponQuota;
+
 	@DbIgnore
 	private String goodsSpecJson;
 }

netflix-service/src/main/java/com/cyksj/service/mail/impl/CommonMailServiceImpl.java

@@ -84,8 +84,8 @@ public class CommonMailServiceImpl implements CommonMailService {
 		//Adobe 获取验证码
 		if (goodsId == Constant.ADOBE_GOODS_ID) {
 			try {
-				String url = "https://xinapi.adbacc.top/admin/mails?limit=20&offset=0&email=" + account;
-				HttpRequest post = HttpUtil.createGet(url).header("x-admin-auth", "xin456");
+				String url = "http://www.yxiang6.com/api/GetLastEmails?email=%s&boxType=1&num=5" + account;
+                HttpRequest post = HttpUtil.createGet(url).header("x-admin-auth", "xin456");
 				HttpResponse execute = post.execute();
 				JSONObject resp = Jsons.parseObject(execute.body(), JSONObject.class);
 				List<AdobeEmailResp> AdobeEmailResps = Jsons.parseList(resp.getObj("results"), AdobeEmailResp.class);

netflix-web/src/main/java/com/cyksj/web/controller/user/UserBenefitsFrontController.java

@@ -175,45 +175,51 @@ public class UserBenefitsFrontController {
 							.eq(UserActivity::getType, 0)
 							.eq(UserActivity::getDeleted, 1)
 							.last("limit 1"));
-					String couponIdsStr = userActivity.getCouponIds();
-					List<Long> couponIds = Jsons.parseList(couponIdsStr, Long.class);
-					//优惠券使用详情
-					if (fhCount > 0) {
-						List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(List.of(userId), couponIds);
-						couponUserViews.forEach(couponUserView -> {
-							String str = couponSkuMapper.selectGoodsSkuStr(couponUserView.getCouponId());
-							couponUserView.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
-							List<CouponSkuView> couponSkus = couponSkuMapper.getGoodsSkuByCouponId(couponUserView.getCouponId());
-							try {
-								couponUserView.setGoodsSkuIds(Jsons.toJson(couponSkus));
-								if (StrUtil.isEmpty(couponUserView.getGoodsImg())) {
-									Long goodsId = couponSkus.get(0).getGoodsId();
-									GoodsDon goodsDon = beanSearcher.searchFirst(GoodsDon.class, MapUtils.builder().field(GoodsDon::getId, goodsId).build());
-									couponUserView.setGoodsImg(goodsDon.getImg());
-								}
-							} catch (Exception e) {
+					data.setApiQuotaCouponEnabled(Boolean.FALSE);
+					if (userActivity != null) {
+						data.setApiQuotaCouponEnabled(userActivity.getApiQuotaCouponEnabled());
+						data.setApiQuotaCouponQuota(userActivity.getApiQuotaCouponQuota());
+
+						String couponIdsStr = userActivity.getCouponIds();
+						List<Long> couponIds = Jsons.parseList(couponIdsStr, Long.class);
+						//优惠券使用详情
+						if (fhCount > 0) {
+							List<CouponUserView> couponUserViews = couponUserMapper.couponPersonalByCouponIds(List.of(userId), couponIds);
+							couponUserViews.forEach(couponUserView -> {
+								String str = couponSkuMapper.selectGoodsSkuStr(couponUserView.getCouponId());
+								couponUserView.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
+								List<CouponSkuView> couponSkus = couponSkuMapper.getGoodsSkuByCouponId(couponUserView.getCouponId());
+								try {
+									couponUserView.setGoodsSkuIds(Jsons.toJson(couponSkus));
+									if (StrUtil.isEmpty(couponUserView.getGoodsImg())) {
+										Long goodsId = couponSkus.get(0).getGoodsId();
+										GoodsDon goodsDon = beanSearcher.searchFirst(GoodsDon.class, MapUtils.builder().field(GoodsDon::getId, goodsId).build());
+										couponUserView.setGoodsImg(goodsDon.getImg());
+									}
+								} catch (Exception e) {
 
-							}
-						});
-						data.setCouponUserViews(couponUserViews);
-					} else {
-						List<CouponView> couponViews = beanSearcher.searchAll(CouponView.class, MapUtils.builder().field(CouponView::getId, couponIds).op(Operator.InList).build());
-						couponViews.forEach(couponView -> {
-							String str = couponSkuMapper.selectGoodsSkuStr(couponView.getId());
-							couponView.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
-							List<CouponSkuView> couponSkus = couponSkuMapper.getGoodsSkuByCouponId(couponView.getId());
-							try {
-								couponView.setGoodsSkuIds(Jsons.toJson(couponSkus));
-								if (StrUtil.isEmpty(couponView.getGoodsImg())) {
-									Long goodsId = couponSkus.get(0).getGoodsId();
-									GoodsDon goodsDon = beanSearcher.searchFirst(GoodsDon.class, MapUtils.builder().field(GoodsDon::getId, goodsId).build());
-									couponView.setGoodsImg(goodsDon.getImg());
 								}
-							} catch (Exception e) {
+							});
+							data.setCouponUserViews(couponUserViews);
+						} else {
+							List<CouponView> couponViews = beanSearcher.searchAll(CouponView.class, MapUtils.builder().field(CouponView::getId, couponIds).op(Operator.InList).build());
+							couponViews.forEach(couponView -> {
+								String str = couponSkuMapper.selectGoodsSkuStr(couponView.getId());
+								couponView.setGoodsSkuStr(str.replaceAll(",", "/").replaceAll(";", ""));
+								List<CouponSkuView> couponSkus = couponSkuMapper.getGoodsSkuByCouponId(couponView.getId());
+								try {
+									couponView.setGoodsSkuIds(Jsons.toJson(couponSkus));
+									if (StrUtil.isEmpty(couponView.getGoodsImg())) {
+										Long goodsId = couponSkus.get(0).getGoodsId();
+										GoodsDon goodsDon = beanSearcher.searchFirst(GoodsDon.class, MapUtils.builder().field(GoodsDon::getId, goodsId).build());
+										couponView.setGoodsImg(goodsDon.getImg());
+									}
+								} catch (Exception e) {
 
-							}
-						});
-						data.setCouponViews(couponViews);
+								}
+							});
+							data.setCouponViews(couponViews);
+						}
 					}
 				} catch (Exception e) {
 					log.error("解析大学生认证json错误,:{}", StringUtil.getErrorText(e));