query : querys.entrySet()) {
- if (0 < sbQuery.length()) {
- sbQuery.append("&");
- }
- if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
- sbQuery.append(query.getValue());
- }
- if (!StringUtils.isBlank(query.getKey())) {
- sbQuery.append(query.getKey());
- if (!StringUtils.isBlank(query.getValue())) {
- sbQuery.append("=");
- sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
- }
- }
- }
- if (0 < sbQuery.length()) {
- sbUrl.append("?").append(sbQuery);
- }
- }
-
- return sbUrl.toString();
- }
-
- private static HttpClient wrapClient(String host) {
- HttpClient httpClient = new DefaultHttpClient();
- if (host.startsWith("https://")) {
- sslClient(httpClient);
- }
-
- return httpClient;
- }
-
- private static void sslClient(HttpClient httpClient) {
- try {
- SSLContext ctx = SSLContext.getInstance("TLS");
- X509TrustManager tm = new X509TrustManager() {
- public X509Certificate[] getAcceptedIssuers() {
- return null;
- }
-
- public void checkClientTrusted(X509Certificate[] xcs, String str) {
-
- }
-
- public void checkServerTrusted(X509Certificate[] xcs, String str) {
-
- }
- };
- ctx.init(null, new TrustManager[]{tm}, null);
- SSLSocketFactory ssf = new SSLSocketFactory(ctx);
- ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
- ClientConnectionManager ccm = httpClient.getConnectionManager();
- SchemeRegistry registry = ccm.getSchemeRegistry();
- registry.register(new Scheme("https", 443, ssf));
- } catch (KeyManagementException ex) {
- throw new RuntimeException(ex);
- } catch (NoSuchAlgorithmException ex) {
- throw new RuntimeException(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/gulimall-common/src/main/java/com/forth/common/utils/R.java b/gulimall-common/src/main/java/com/forth/common/utils/R.java
index 2abbaf8..90b548f 100644
--- a/gulimall-common/src/main/java/com/forth/common/utils/R.java
+++ b/gulimall-common/src/main/java/com/forth/common/utils/R.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2016-2019 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
@@ -12,8 +12,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import org.apache.http.HttpStatus;
-
-
import java.util.HashMap;
import java.util.Map;
@@ -23,70 +21,75 @@ import java.util.Map;
* @author Mark sunlightcs@gmail.com
*/
public class R extends HashMap {
- private static final long serialVersionUID = 1L;
-
- public T getData(String key,TypeReference typeReference){
- Object data =get(key);
- String s = JSON.toJSONString(data);
- T t = JSON.parseObject(s,typeReference);
- return t;
- }
- public T getData(TypeReference typeReference){
- Object data =get("data");//默认map
- String s = JSON.toJSONString(data);
- T t = JSON.parseObject(s,typeReference);
- return t;
- }
-
- public R() {
- put("code", 0);
- put("msg", "success");
- }
-
- public static R error() {
- return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常，请联系管理员");
- }
-
- public static R error(String msg) {
- return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
- }
-
- public R setData(Object data) {
- put("data", data);
- return this;
- }
-
- public static R error(int code, String msg) {
- R r = new R();
- r.put("code", code);
- r.put("msg", msg);
- return r;
- }
-
- public static R ok(String msg) {
- R r = new R();
- r.put("msg", msg);
- return r;
- }
-
- public static R ok(Map map) {
- R r = new R();
- r.putAll(map);
- return r;
- }
-
- public static R ok() {
- return new R();
- }
-
- public R put(String key, Object value) {
- super.put(key, value);
- return this;
- }
-
-
- public Integer getCode() {
-
- return (Integer) this.get("code");
- }
+ private static final long serialVersionUID = 1L;
+
+ //利用alibaba提供的fastjson进行逆转
+ public T getData(String key, TypeReference typeReference) {
+ //默认是map
+ Object data = get(key);
+
+ String s = JSON.toJSONString(data);
+ T t = JSON.parseObject(s, typeReference);
+ return t;
+ }
+ //返回数据
+ public R setData(Object data) {
+ put("data", data);
+ return this;
+ }
+ //利用alibaba提供的fastjson进行逆转
+ public T getData(TypeReference typeReference) {
+ //默认是map
+ Object data = get("data");
+
+ String s = JSON.toJSONString(data);
+ T t = JSON.parseObject(s, typeReference);
+ return t;
+ }
+
+
+ public R() {
+ put("code", 0);
+ put("msg", "success");
+ }
+
+ public static R error() {
+ return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常，请联系管理员");
+ }
+
+ public static R error(String msg) {
+ return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
+ }
+
+ public static R error(int code, String msg) {
+ R r = new R();
+ r.put("code", code);
+ r.put("msg", msg);
+ return r;
+ }
+
+ public static R ok(String msg) {
+ R r = new R();
+ r.put("msg", msg);
+ return r;
+ }
+
+ public static R ok(Map map) {
+ R r = new R();
+ r.putAll(map);
+ return r;
+ }
+
+ public static R ok() {
+ return new R();
+ }
+
+ public R put(String key, Object value) {
+ super.put(key, value);
+ return this;
+ }
+
+ public Integer getCode() {
+ return (Integer) this.get("code");
+ }
}
diff --git a/gulimall-common/src/main/java/com/forth/common/vo/MemberRespVo.java b/gulimall-common/src/main/java/com/forth/common/vo/MemberRespVo.java
deleted file mode 100644
index eab6950..0000000
--- a/gulimall-common/src/main/java/com/forth/common/vo/MemberRespVo.java
+++ /dev/null
@@ -1,89 +0,0 @@
-//package com.forth.common.vo;
-//
-//import lombok.Data;
-//import lombok.ToString;
-//
-//import java.io.Serializable;
-//import java.util.Date;
-//@ToString
-//@Data
-//public class MemberRespVo implements Serializable {
-// /**
-// * id
-// */
-//
-// private Long id;
-// /**
-// * 会员等级id
-// */
-// private Long levelId;
-// /**
-// * 用户名
-// */
-// private String username;
-// /**
-// * 密码
-// */
-// private String password;
-// /**
-// * 昵称
-// */
-// private String nickname;
-// /**
-// * 手机号码
-// */
-// private String mobile;
-// /**
-// * 邮箱
-// */
-// private String email;
-// /**
-// * 头像
-// */
-// private String header;
-// /**
-// * 性别
-// */
-// private Integer gender;
-// /**
-// * 生日
-// */
-// private Date birth;
-// /**
-// * 所在城市
-// */
-// private String city;
-// /**
-// * 职业
-// */
-// private String job;
-// /**
-// * 个性签名
-// */
-// private String sign;
-// /**
-// * 用户来源
-// */
-// private Integer sourceType;
-// /**
-// * 积分
-// */
-// private Integer integration;
-// /**
-// * 成长值
-// */
-// private Integer growth;
-// /**
-// * 启用状态
-// */
-// private Integer status;
-// /**
-// * 注册时间
-// */
-// private Date createTime;
-//
-// private String socialUid;
-// private String accessToken;
-// private Long expiresIn;
-//
-//}
diff --git a/gulimall-coupon/pom.xml b/gulimall-coupon/pom.xml
index ea01519..9fbc362 100644
--- a/gulimall-coupon/pom.xml
+++ b/gulimall-coupon/pom.xml
@@ -8,7 +8,7 @@
2.3.5.RELEASE
- com.forth.gulimall
+ com.forth.coupon
gulimall-coupon
0.0.1-SNAPSHOT
gulimall-coupon
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java
index b19ce61..1476856 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/GulimallCouponApplication.java
@@ -1,12 +1,10 @@
package com.forth.gulimall.coupon;
-import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@EnableDiscoveryClient
-@MapperScan("com.forth.gulimall.coupon.dao")
@SpringBootApplication
public class GulimallCouponApplication {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java
index d723e92..5cf11d9 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponController.java
@@ -3,8 +3,9 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,23 +22,38 @@ import com.forth.common.utils.R;
/**
* 优惠券信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
+@RefreshScope
@RestController
@RequestMapping("coupon/coupon")
public class CouponController {
@Autowired
private CouponService couponService;
+ @Value("${coupon.user.name}")
+ private String name;
+ @Value("${coupon.user.age}")
+ private Integer age;
+
+ @RequestMapping("/test")
+ public R test(){
+ return R.ok().put("name",name).put("age",age);
+ }
+
- @RequestMapping("/member/list")
- public R membercoupon(){
- CouponEntity couponEntity = new CouponEntity();
+ @RequestMapping("/member/list")
+ public R membercoupons(){
+ CouponEntity couponEntity=new CouponEntity();
couponEntity.setCouponName("满100减10");
- return R.ok().put("coupons",Arrays.asList(couponEntity));
+ return R.ok().put("coupons",Arrays.asList(couponEntity));
+
}
+
+
+
/**
* 列表
*/
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java
index aff008e..c78ba9a 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponHistoryController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 优惠券领取历史记录
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/couponhistory")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java
index db23403..c02d569 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuCategoryRelationController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 优惠券分类关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/couponspucategoryrelation")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java
index 654c54c..3f12b60 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/CouponSpuRelationController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 优惠券与产品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:51
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/couponspurelation")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java
index b0db7b9..5271e84 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeAdvController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 首页轮播广告
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/homeadv")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java
index ac797e2..0e5899a 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/homesubject")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java
index cc99980..ea1b93f 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/HomeSubjectSpuController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 专题商品
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/homesubjectspu")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java
index ab427d3..1a7d9d1 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/MemberPriceController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 商品会员价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/memberprice")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java
index 7a76e2e..7011912 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillPromotionController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 秒杀活动
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/seckillpromotion")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java
index 0582bf2..7e7a16a 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSessionController.java
@@ -1,15 +1,11 @@
package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
+import java.util.List;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.forth.gulimall.coupon.entity.SeckillSessionEntity;
import com.forth.gulimall.coupon.service.SeckillSessionService;
@@ -21,9 +17,9 @@ import com.forth.common.utils.R;
/**
* 秒杀活动场次
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/seckillsession")
@@ -31,6 +27,13 @@ public class SeckillSessionController {
@Autowired
private SeckillSessionService seckillSessionService;
+ @GetMapping("/lates3DaySession")
+ public R getLates3DaySession(){
+ List sessions = seckillSessionService.getLates3DaySession();
+ return R.ok().setData(sessions);
+ }
+
+
/**
* 列表
*/
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java
index aa507f6..a26d7c5 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuNoticeController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 秒杀商品通知订阅
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/seckillskunotice")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java
index fc1d24b..0f8af63 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SeckillSkuRelationController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 秒杀活动商品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/seckillskurelation")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java
index 9b480ad..26738fa 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuFullReductionController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 商品满减信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/skufullreduction")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java
index 4d17624..d48174a 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SkuLadderController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 商品阶梯价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/skuladder")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java
index d47402e..4fe140d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/controller/SpuBoundsController.java
@@ -3,7 +3,6 @@ package com.forth.gulimall.coupon.controller;
import java.util.Arrays;
import java.util.Map;
-//import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,9 +20,9 @@ import com.forth.common.utils.R;
/**
* 商品spu积分设置
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@RestController
@RequestMapping("coupon/spubounds")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java
index 93fba9b..138fcd1 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 优惠券信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface CouponDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java
index 6f0ef7c..84bae1d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponHistoryDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 优惠券领取历史记录
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface CouponHistoryDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java
index 8045f61..03be820 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuCategoryRelationDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 优惠券分类关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface CouponSpuCategoryRelationDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java
index ef1dd0e..e240b68 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/CouponSpuRelationDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 优惠券与产品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:51
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface CouponSpuRelationDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java
index e264135..cc0a6a0 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeAdvDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 首页轮播广告
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface HomeAdvDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java
index 19ca2db..65cc6cc 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface HomeSubjectDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java
index efe2ed6..aac2a59 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/HomeSubjectSpuDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 专题商品
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface HomeSubjectSpuDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java
index 09ff4e4..9e260e0 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/MemberPriceDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 商品会员价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface MemberPriceDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java
index 953ea52..742a2dc 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillPromotionDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 秒杀活动
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SeckillPromotionDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java
index e0ed817..17b52f9 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSessionDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 秒杀活动场次
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SeckillSessionDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java
index 6de09d6..2dca7a5 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuNoticeDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 秒杀商品通知订阅
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SeckillSkuNoticeDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java
index e8faed1..f774c79 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SeckillSkuRelationDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 秒杀活动商品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SeckillSkuRelationDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java
index 15ad9a0..fa3e984 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuFullReductionDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 商品满减信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SkuFullReductionDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java
index 0bea2c2..ec41571 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SkuLadderDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 商品阶梯价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SkuLadderDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java
index 9ef61ff..adaf7ab 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/dao/SpuBoundsDao.java
@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Mapper;
/**
* 商品spu积分设置
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Mapper
public interface SpuBoundsDao extends BaseMapper {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java
index 2dddfdf..c25d99e 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 优惠券信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_coupon")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java
index d4ce9b8..cc48b56 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponHistoryEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 优惠券领取历史记录
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_coupon_history")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java
index 1f8606d..1d21ccf 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuCategoryRelationEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 优惠券分类关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_coupon_spu_category_relation")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java
index 4d097c0..8d14d17 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/CouponSpuRelationEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 优惠券与产品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:51
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_coupon_spu_relation")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java
index 2b61bf7..a3801f9 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeAdvEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 首页轮播广告
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_home_adv")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java
index bf172cb..0081a6f 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_home_subject")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java
index 9736f0b..b588bc4 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/HomeSubjectSpuEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 专题商品
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_home_subject_spu")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java
index 24c965a..4b64627 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/MemberPriceEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 商品会员价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_member_price")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java
index 0defa64..3db6fc6 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillPromotionEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 秒杀活动
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_seckill_promotion")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java
index 7267d05..067a7c3 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSessionEntity.java
@@ -1,18 +1,21 @@
package com.forth.gulimall.coupon.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
+
import lombok.Data;
/**
* 秒杀活动场次
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_seckill_session")
@@ -44,5 +47,6 @@ public class SeckillSessionEntity implements Serializable {
* 创建时间
*/
private Date createTime;
-
+ @TableField(exist = false)
+ private List relationSkus;
}
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java
index 5a5af19..da355c6 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuNoticeEntity.java
@@ -10,9 +10,9 @@ import lombok.Data;
/**
* 秒杀商品通知订阅
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_seckill_sku_notice")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java
index 58a82a1..0bc1f94 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SeckillSkuRelationEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 秒杀活动商品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_seckill_sku_relation")
@@ -40,15 +40,15 @@ public class SeckillSkuRelationEntity implements Serializable {
/**
* 秒杀价格
*/
- private BigDecimal seckillPrice;
+ private Integer seckillPrice;
/**
* 秒杀总量
*/
- private BigDecimal seckillCount;
+ private int seckillCount;
/**
* 每人限购数量
*/
- private BigDecimal seckillLimit;
+ private int seckillLimit;
/**
* 排序
*/
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java
index dc51b39..2aca5e8 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuFullReductionEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 商品满减信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_sku_full_reduction")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java
index 9058347..94b6773 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SkuLadderEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 商品阶梯价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_sku_ladder")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java
index 1e2ebb9..80cb40b 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/entity/SpuBoundsEntity.java
@@ -11,9 +11,9 @@ import lombok.Data;
/**
* 商品spu积分设置
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
@Data
@TableName("sms_spu_bounds")
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java
index 53c710d..eb52881 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponHistoryService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 优惠券领取历史记录
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface CouponHistoryService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java
index edad5a2..41d7052 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 优惠券信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface CouponService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java
index f654bc1..b0eacba 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuCategoryRelationService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 优惠券分类关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface CouponSpuCategoryRelationService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java
index 43d46fc..bcd1bde 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/CouponSpuRelationService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 优惠券与产品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:51
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface CouponSpuRelationService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java
index e450522..5694095 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeAdvService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 首页轮播广告
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface HomeAdvService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java
index f03e643..ae3b643 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 首页专题表【jd首页下面很多专题，每个专题链接新的页面，展示专题商品信息】
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface HomeSubjectService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java
index c027768..409eb1d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/HomeSubjectSpuService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 专题商品
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface HomeSubjectSpuService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java
index ecc73a9..7ab9c7d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/MemberPriceService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 商品会员价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface MemberPriceService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java
index 678b0f9..f738842 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillPromotionService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 秒杀活动
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SeckillPromotionService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java
index 50e2989..73248a3 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSessionService.java
@@ -4,17 +4,20 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.forth.common.utils.PageUtils;
import com.forth.gulimall.coupon.entity.SeckillSessionEntity;
+import java.util.List;
import java.util.Map;
/**
* 秒杀活动场次
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SeckillSessionService extends IService {
PageUtils queryPage(Map params);
+
+ List getLates3DaySession();
}
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java
index e007f51..a4f0e8d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuNoticeService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 秒杀商品通知订阅
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SeckillSkuNoticeService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java
index 366c7fb..0329782 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SeckillSkuRelationService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 秒杀活动商品关联
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SeckillSkuRelationService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java
index 24041ad..21f621d 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuFullReductionService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 商品满减信息
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:49
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SkuFullReductionService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java
index 36b5765..74abfa5 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SkuLadderService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 商品阶梯价格
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SkuLadderService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java
index 4c697ad..cbbc26b 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/SpuBoundsService.java
@@ -9,9 +9,9 @@ import java.util.Map;
/**
* 商品spu积分设置
*
- * @author fourth-miaowei
- * @email 2608957980@qq.com
- * @date 2020-11-12 10:16:50
+ * @author fourth-ChenAng
+ * @email 1982673145@qq.com
+ * @date 2020-11-11 10:11:00
*/
public interface SpuBoundsService extends IService {
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java
index af0ba9f..d088a66 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSessionServiceImpl.java
@@ -1,7 +1,18 @@
package com.forth.gulimall.coupon.service.impl;
+import com.forth.gulimall.coupon.entity.SeckillSkuRelationEntity;
+import com.forth.gulimall.coupon.service.SeckillSkuRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +27,10 @@ import com.forth.gulimall.coupon.service.SeckillSessionService;
@Service("seckillSessionService")
public class SeckillSessionServiceImpl extends ServiceImpl implements SeckillSessionService {
+ @Autowired
+ SeckillSkuRelationService seckillSkuRelationService;
+
+
@Override
public PageUtils queryPage(Map params) {
IPage page = this.page(
@@ -26,4 +41,42 @@ public class SeckillSessionServiceImpl extends ServiceImpl getLates3DaySession() {
+//计算最近三天的
+// Date date = new Date();
+// LocalDate now = LocalDate.now();
+// LocalDate plus = now.plus(Duration.ofDays(1));
+// LocalDate plus2 = now.plus(Duration.ofDays(2));
+ List list = this.list(new QueryWrapper().between("start_time", startTime(), endTime()));
+ if(list!=null && list.size()>0){
+ List collect = list.stream().map(session -> {
+
+ Long id = session.getId();
+ List relationEntities = seckillSkuRelationService.list(new QueryWrapper().eq("promotion_session_id", id));
+ session.setRelationSkus(relationEntities);
+ return session;
+ }).collect(Collectors.toList());
+ return collect;
+ }
+ return null;
+
+ }
+
+ private String startTime(){
+ LocalDate now = LocalDate.now();
+ LocalTime min = LocalTime.MIN;
+ LocalDateTime start = LocalDateTime.of(now, min);
+ String format = start.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ return format;
+ }
+ private String endTime(){
+ LocalDate now = LocalDate.now();
+ LocalDate plus2 = now.plusDays(2);
+ LocalTime max = LocalTime.MAX;
+ LocalDateTime end = LocalDateTime.of(plus2, max);
+ String format = end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ return format;
+ }
+
}
\ No newline at end of file
diff --git a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java
index b1926df..5221e05 100644
--- a/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java
+++ b/gulimall-coupon/src/main/java/com/forth/gulimall/coupon/service/impl/SeckillSkuRelationServiceImpl.java
@@ -1,5 +1,6 @@
package com.forth.gulimall.coupon.service.impl;
+import com.alibaba.nacos.client.utils.StringUtils;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +19,14 @@ public class SeckillSkuRelationServiceImpl extends ServiceImpl params) {
+ QueryWrapper QueryWrapper = new QueryWrapper();
+ String promotionSessionId = (String) params.get("promotionSessionId");
+ if (!StringUtils.isEmpty(promotionSessionId)) {
+ QueryWrapper.eq("promotion_session_id",promotionSessionId);
+ }
IPage page = this.page(
new Query().getPage(params),
- new QueryWrapper()
+ QueryWrapper
);
return new PageUtils(page);
diff --git a/gulimall-coupon/src/main/resources/application.yml b/gulimall-coupon/src/main/resources/application.yml
index 673424c..092d288 100644
--- a/gulimall-coupon/src/main/resources/application.yml
+++ b/gulimall-coupon/src/main/resources/application.yml
@@ -1,21 +1,21 @@
-server:
- port: 4005
spring:
datasource:
username: root
password: root
url: jdbc:mysql://39.97.249.66:3306/gulimall_sms
- driver-class-name: com.mysql.cj.jdbc.Driver
+ driver-class-name: com.mysql.jdbc.Driver
cloud:
nacos:
discovery:
- server-addr: 39.97.249.66:8848
+ server-addr: 127.0.0.1:8848
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
application:
- name: coupon
+ name: gulimall-coupon
mybatis-plus:
mapper-locations: classpath:/mapper/**/*.xml
global-config:
db-config:
- id-type: auto
-
-
+ id-type: AUTO
+server:
+ port: 4005
\ No newline at end of file
diff --git a/gulimall-coupon/src/main/resources/bootstrap.properties b/gulimall-coupon/src/main/resources/bootstrap.properties
index 02adab5..4bf72a4 100644
--- a/gulimall-coupon/src/main/resources/bootstrap.properties
+++ b/gulimall-coupon/src/main/resources/bootstrap.properties
@@ -1,7 +1,16 @@
-spring.application.name=coupon
-spring.cloud.nacos.config.server-addr=39.97.249.66:8848
-spring.cloud.nacos.config.namespace=70ae551e-e253-4abd-ba48-e7ec3c96f1ed
-
-spring.cloud.nacos.config.ext-config[0].data-id=coupon.yml
-spring.cloud.nacos.config.ext-config[0].group=DEFAULT_GROUP
-spring.cloud.nacos.config.ext-config[0].refresh=true
\ No newline at end of file
+spring.application.name=gulimall-coupon
+spring.cloud.nacos.config.server-addr=127.0.0.1:8848
+spring.cloud.nacos.config.namespace=3b9fbaa4-ca84-46f4-894a-aec139c39313
+#spring.cloud.nacos.config.group=prod
+#
+#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+#spring.cloud.nacos.config.ext-config[0].group=dev
+#spring.cloud.nacos.config.ext-config[0].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[1].group=dev
+#spring.cloud.nacos.config.ext-config[1].refresh=true
+#
+#spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
\ No newline at end of file
diff --git a/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java b/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java
index 1fef888..524ef42 100644
--- a/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java
+++ b/gulimall-coupon/src/test/java/com/forth/gulimall/coupon/GulimallCouponApplicationTests.java
@@ -1,23 +1,23 @@
package com.forth.gulimall.coupon;
-import com.forth.gulimall.coupon.entity.CouponEntity;
-import com.forth.gulimall.coupon.service.CouponService;
import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
@SpringBootTest
class GulimallCouponApplicationTests {
- @Autowired
- CouponService couponService;
-
@Test
void contextLoads() {
- CouponEntity couponEntity = new CouponEntity();
- couponEntity.setCode("123456");
- couponService.save(couponEntity);
- System.out.println("success");
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusDays(2);
+ LocalDateTime of=LocalDateTime.of(localDate, LocalTime.MAX);
+ String format = of.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ System.out.println(format);
}
}
diff --git a/gulimall-gateway/pom.xml b/gulimall-gateway/pom.xml
index 5ad3121..cf2784e 100644
--- a/gulimall-gateway/pom.xml
+++ b/gulimall-gateway/pom.xml
@@ -8,29 +8,23 @@
2.3.5.RELEASE
- com.forth.gulimall
+ com.atguigu.gulimall
gulimall-gateway
0.0.1-SNAPSHOT
gulimall-gateway
- 谷粒商城-网关路由
+ API网关
1.8
- Hoxton.SR8
+ Hoxton.SR9
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-discovery
+ com.forth.gulimall
+ gulimall-common
+ 0.0.1-SNAPSHOT
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
-
org.springframework.cloud
spring-cloud-starter-gateway
@@ -52,14 +46,6 @@
pom
import
-
-
- com.alibaba.cloud
- spring-cloud-alibaba-dependencies
- 2.1.0.RELEASE
- pom
- import
-