couponUserList = couponUserService.queryExpired();
- for(LitemallCouponUser couponUser : couponUserList){
+ for (LitemallCouponUser couponUser : couponUserList) {
couponUser.setStatus(CouponUserConstant.STATUS_EXPIRED);
couponUserService.update(couponUser);
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
index a29536ee..c286367c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/job/OrderJob.java
@@ -3,12 +3,8 @@ package org.linlinjava.litemall.admin.job;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.linlinjava.litemall.core.system.SystemConfig;
-import org.linlinjava.litemall.db.domain.LitemallGoodsProduct;
-import org.linlinjava.litemall.db.domain.LitemallOrder;
-import org.linlinjava.litemall.db.domain.LitemallOrderGoods;
-import org.linlinjava.litemall.db.service.LitemallGoodsProductService;
-import org.linlinjava.litemall.db.service.LitemallOrderGoodsService;
-import org.linlinjava.litemall.db.service.LitemallOrderService;
+import org.linlinjava.litemall.db.domain.*;
+import org.linlinjava.litemall.db.service.*;
import org.linlinjava.litemall.db.util.OrderUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -31,43 +27,10 @@ public class OrderJob {
private LitemallOrderService orderService;
@Autowired
private LitemallGoodsProductService productService;
-
- /**
- * 自动取消订单
- *
- * 定时检查订单未付款情况，如果超时 LITEMALL_ORDER_UNPAID 分钟则自动取消订单
- * 定时时间是每次相隔半个小时。
- *
- * TODO
- * 注意，因为是相隔半小时检查，因此导致订单真正超时时间是 [LITEMALL_ORDER_UNPAID, 30 + LITEMALL_ORDER_UNPAID]
- */
- @Scheduled(fixedDelay = 30 * 60 * 1000)
- @Transactional
- public void checkOrderUnpaid() {
- logger.info("系统开启任务检查订单是否已经超期自动取消订单");
-
- List orderList = orderService.queryUnpaid(SystemConfig.getOrderUnpaid());
- for (LitemallOrder order : orderList) {
- // 设置订单已取消状态
- order.setOrderStatus(OrderUtil.STATUS_AUTO_CANCEL);
- order.setEndTime(LocalDateTime.now());
- if (orderService.updateWithOptimisticLocker(order) == 0) {
- throw new RuntimeException("更新数据已失效");
- }
-
- // 商品货品数量增加
- Integer orderId = order.getId();
- List orderGoodsList = orderGoodsService.queryByOid(orderId);
- for (LitemallOrderGoods orderGoods : orderGoodsList) {
- Integer productId = orderGoods.getProductId();
- Short number = orderGoods.getNumber();
- if (productService.addStock(productId, number) == 0) {
- throw new RuntimeException("商品货品库存增加失败");
- }
- }
- logger.info("订单 ID=" + order.getId() + " 已经超期自动取消订单");
- }
- }
+ @Autowired
+ private LitemallGrouponService grouponService;
+ @Autowired
+ private LitemallGrouponRulesService rulesService;
/**
* 自动确认订单
@@ -80,7 +43,7 @@ public class OrderJob {
*/
@Scheduled(cron = "0 0 3 * * ?")
public void checkOrderUnconfirm() {
- logger.info("系统开启任务检查订单是否已经超期自动确认收货");
+ logger.info("系统开启定时任务检查订单是否已经超期自动确认收货");
List orderList = orderService.queryUnconfirm(SystemConfig.getOrderUnconfirm());
for (LitemallOrder order : orderList) {
@@ -109,7 +72,6 @@ public class OrderJob {
public void checkOrderComment() {
logger.info("系统开启任务检查订单是否已经超期未评价");
- LocalDateTime now = LocalDateTime.now();
List orderList = orderService.queryComment(SystemConfig.getOrderComment());
for (LitemallOrder order : orderList) {
order.setComments((short) 0);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
index 9ac2fc05..a049e925 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminGoodsService.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.service;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.linlinjava.litemall.admin.dto.GoodsAllinone;
@@ -40,21 +39,13 @@ public class AdminGoodsService {
private LitemallBrandService brandService;
@Autowired
private LitemallCartService cartService;
- @Autowired
- private LitemallOrderGoodsService orderGoodsService;
-
@Autowired
private QCodeService qCodeService;
- public Object list(String goodsSn, String name,
+ public Object list(Integer goodsId, String goodsSn, String name,
Integer page, Integer limit, String sort, String order) {
- List goodsList = goodsService.querySelective(goodsSn, name, page, limit, sort, order);
- long total = PageInfo.of(goodsList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", goodsList);
-
- return ResponseUtil.ok(data);
+ List goodsList = goodsService.querySelective(goodsId, goodsSn, name, page, limit, sort, order);
+ return ResponseUtil.okList(goodsList);
}
private Object validate(GoodsAllinone goodsAllinone) {
@@ -129,19 +120,25 @@ public class AdminGoodsService {
/**
* 编辑商品
- *
- * TODO
- * 目前商品修改的逻辑是
- * 1. 更新litemall_goods表
- * 2. 逻辑删除litemall_goods_specification、litemall_goods_attribute、litemall_goods_product
- * 3. 添加litemall_goods_specification、litemall_goods_attribute、litemall_goods_product
- *
- * 这里商品三个表的数据采用删除再添加的策略是因为
- * 商品编辑页面，支持管理员添加删除商品规格、添加删除商品属性，因此这里仅仅更新是不可能的，
- * 只能删除三个表旧的数据，然后添加新的数据。
- * 但是这里又会引入新的问题，就是存在订单商品货品ID指向了失效的商品货品表。
- * 因此这里会拒绝管理员编辑商品，如果订单或购物车中存在商品。
- * 所以这里可能需要重新设计。
+ *
+ * NOTE：
+ * 由于商品涉及到四个表，特别是litemall_goods_product表依赖litemall_goods_specification表，
+ * 这导致允许所有字段都是可编辑会带来一些问题，因此这里商品编辑功能是受限制：
+ * （1）litemall_goods表可以编辑字段；
+ * （2）litemall_goods_specification表只能编辑pic_url字段，其他操作不支持；
+ * （3）litemall_goods_product表只能编辑price, number和url字段，其他操作不支持；
+ * （4）litemall_goods_attribute表支持编辑、添加和删除操作。
+ *
+ * NOTE2:
+ * 前后端这里使用了一个小技巧：
+ * 如果前端传来的update_time字段是空，则说明前端已经更新了某个记录，则这个记录会更新；
+ * 否则说明这个记录没有编辑过，无需更新该记录。
+ *
+ * NOTE3:
+ * （1）购物车缓存了一些商品信息，因此需要及时更新。
+ * 目前这些字段是goods_sn, goods_name, price, pic_url。
+ * （2）但是订单里面的商品信息则是不会更新。
+ * 如果订单是未支付订单，此时仍然以旧的价格支付。
*/
@Transactional
public Object update(GoodsAllinone goodsAllinone) {
@@ -155,38 +152,62 @@ public class AdminGoodsService {
LitemallGoodsSpecification[] specifications = goodsAllinone.getSpecifications();
LitemallGoodsProduct[] products = goodsAllinone.getProducts();
- Integer id = goods.getId();
-
//将生成的分享图片地址写入数据库
String url = qCodeService.createGoodShareImage(goods.getId().toString(), goods.getPicUrl(), goods.getName());
goods.setShareUrl(url);
+ // 商品表里面有一个字段retailPrice记录当前商品的最低价
+ BigDecimal retailPrice = new BigDecimal(Integer.MAX_VALUE);
+ for (LitemallGoodsProduct product : products) {
+ BigDecimal productPrice = product.getPrice();
+ if(retailPrice.compareTo(productPrice) == 1){
+ retailPrice = productPrice;
+ }
+ }
+ goods.setRetailPrice(retailPrice);
+
// 商品基本信息表litemall_goods
if (goodsService.updateById(goods) == 0) {
throw new RuntimeException("更新数据失败");
}
Integer gid = goods.getId();
- specificationService.deleteByGid(gid);
- attributeService.deleteByGid(gid);
- productService.deleteByGid(gid);
// 商品规格表litemall_goods_specification
for (LitemallGoodsSpecification specification : specifications) {
- specification.setGoodsId(goods.getId());
- specificationService.add(specification);
- }
-
- // 商品参数表litemall_goods_attribute
- for (LitemallGoodsAttribute attribute : attributes) {
- attribute.setGoodsId(goods.getId());
- attributeService.add(attribute);
+ // 目前只支持更新规格表的图片字段
+ if(specification.getUpdateTime() == null){
+ specification.setSpecification(null);
+ specification.setValue(null);
+ specificationService.updateById(specification);
+ }
}
// 商品货品表litemall_product
for (LitemallGoodsProduct product : products) {
- product.setGoodsId(goods.getId());
- productService.add(product);
+ if(product.getUpdateTime() == null) {
+ productService.updateById(product);
+ }
+ }
+
+ // 商品参数表litemall_goods_attribute
+ for (LitemallGoodsAttribute attribute : attributes) {
+ if (attribute.getId() == null || attribute.getId().equals(0)){
+ attribute.setGoodsId(goods.getId());
+ attributeService.add(attribute);
+ }
+ else if(attribute.getDeleted()){
+ attributeService.deleteById(attribute.getId());
+ }
+ else if(attribute.getUpdateTime() == null){
+ attributeService.updateById(attribute);
+ }
+ }
+
+ // 这里需要注意的是购物车litemall_cart有些字段是拷贝商品的一些字段，因此需要及时更新
+ // 目前这些字段是goods_sn, goods_name, price, pic_url
+ for (LitemallGoodsProduct product : products) {
+ cartService.updateProduct(product.getId(), goods.getGoodsSn(), goods.getName(), product.getPrice(), product.getUrl());
}
return ResponseUtil.ok();
@@ -224,6 +245,16 @@ public class AdminGoodsService {
return ResponseUtil.fail(GOODS_NAME_EXIST, "商品名已经存在");
}
+ // 商品表里面有一个字段retailPrice记录当前商品的最低价
+ BigDecimal retailPrice = new BigDecimal(Integer.MAX_VALUE);
+ for (LitemallGoodsProduct product : products) {
+ BigDecimal productPrice = product.getPrice();
+ if(retailPrice.compareTo(productPrice) == 1){
+ retailPrice = productPrice;
+ }
+ }
+ goods.setRetailPrice(retailPrice);
+
// 商品基本信息表litemall_goods
goodsService.add(goods);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
index e361922c..cb56fdd4 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/AdminOrderService.java
@@ -4,7 +4,6 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.linlinjava.litemall.core.notify.NotifyService;
@@ -54,14 +53,9 @@ public class AdminOrderService {
public Object list(Integer userId, String orderSn, List orderStatusArray,
Integer page, Integer limit, String sort, String order) {
- List orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit, sort, order);
- long total = PageInfo.of(orderList).getTotal();
-
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", orderList);
-
- return ResponseUtil.ok(data);
+ List orderList = orderService.querySelective(userId, orderSn, orderStatusArray, page, limit,
+ sort, order);
+ return ResponseUtil.okList(orderList);
}
public Object detail(Integer id) {
@@ -126,11 +120,11 @@ public class AdminOrderService {
wxPayRefundRequest.setTotalFee(totalFee);
wxPayRefundRequest.setRefundFee(totalFee);
- WxPayRefundResult wxPayRefundResult = null;
+ WxPayRefundResult wxPayRefundResult;
try {
wxPayRefundResult = wxPayService.refund(wxPayRefundRequest);
} catch (WxPayException e) {
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
}
if (!wxPayRefundResult.getReturnCode().equals("SUCCESS")) {
@@ -142,8 +136,15 @@ public class AdminOrderService {
return ResponseUtil.fail(ORDER_REFUND_FAILED, "订单退款失败");
}
+ LocalDateTime now = LocalDateTime.now();
// 设置订单取消状态
order.setOrderStatus(OrderUtil.STATUS_REFUND_CONFIRM);
+ order.setEndTime(now);
+ // 记录订单退款相关信息
+ order.setRefundAmount(order.getActualPrice());
+ order.setRefundType("微信退款接口");
+ order.setRefundContent(wxPayRefundResult.getRefundId());
+ order.setRefundTime(now);
if (orderService.updateWithOptimisticLocker(order) == 0) {
throw new RuntimeException("更新数据已失效");
}
@@ -161,7 +162,8 @@ public class AdminOrderService {
//TODO 发送邮件和短信通知，这里采用异步发送
// 退款成功通知用户, 例如“您申请的订单退款 [ 单号:{1} ] 已成功，请耐心等待到账。”
// 注意订单号只发后6位
- notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND, new String[]{order.getOrderSn().substring(8, 14)});
+ notifyService.notifySmsTemplate(order.getMobile(), NotifyType.REFUND,
+ new String[]{order.getOrderSn().substring(8, 14)});
logHelper.logOrderSucceed("退款", "订单编号 " + orderId);
return ResponseUtil.ok();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
index 445cc29f..70e5d58c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/service/LogHelper.java
@@ -19,87 +19,86 @@ import javax.servlet.http.HttpServletRequest;
* 安全日志：用户安全相关的操作日志，例如登录、删除管理员
* 订单日志：用户交易相关的操作日志，例如订单发货、退款
* 其他日志：如果以上三种不合适，可以选择其他日志，建议是优先级最低的日志级别
- *
+ *
* 当然可能很多操作是不需要记录到数据库的，例如编辑商品、编辑广告品之类。
*/
@Component
public class LogHelper {
- public final static Integer LOG_TYPE_GENERAL = 0;
- public final static Integer LOG_TYPE_AUTH = 1;
- public final static Integer LOG_TYPE_ORDER = 2;
- public final static Integer LOG_TYPE_OTHER = 3;
+ public static final Integer LOG_TYPE_GENERAL = 0;
+ public static final Integer LOG_TYPE_AUTH = 1;
+ public static final Integer LOG_TYPE_ORDER = 2;
+ public static final Integer LOG_TYPE_OTHER = 3;
@Autowired
private LitemallLogService logService;
- public void logGeneralSucceed(String action){
+ public void logGeneralSucceed(String action) {
logAdmin(LOG_TYPE_GENERAL, action, true, "", "");
}
- public void logGeneralSucceed(String action, String result){
+ public void logGeneralSucceed(String action, String result) {
logAdmin(LOG_TYPE_GENERAL, action, true, result, "");
}
- public void logGeneralFail(String action, String error){
+ public void logGeneralFail(String action, String error) {
logAdmin(LOG_TYPE_GENERAL, action, false, error, "");
}
- public void logAuthSucceed(String action){
+ public void logAuthSucceed(String action) {
logAdmin(LOG_TYPE_AUTH, action, true, "", "");
}
- public void logAuthSucceed(String action, String result){
+ public void logAuthSucceed(String action, String result) {
logAdmin(LOG_TYPE_AUTH, action, true, result, "");
}
- public void logAuthFail(String action, String error){
+ public void logAuthFail(String action, String error) {
logAdmin(LOG_TYPE_AUTH, action, false, error, "");
}
- public void logOrderSucceed(String action){
+ public void logOrderSucceed(String action) {
logAdmin(LOG_TYPE_ORDER, action, true, "", "");
}
- public void logOrderSucceed(String action, String result){
+ public void logOrderSucceed(String action, String result) {
logAdmin(LOG_TYPE_ORDER, action, true, result, "");
}
- public void logOrderFail(String action, String error){
+ public void logOrderFail(String action, String error) {
logAdmin(LOG_TYPE_ORDER, action, false, error, "");
}
- public void logOtherSucceed(String action){
+ public void logOtherSucceed(String action) {
logAdmin(LOG_TYPE_OTHER, action, true, "", "");
}
- public void logOtherSucceed(String action, String result){
+ public void logOtherSucceed(String action, String result) {
logAdmin(LOG_TYPE_OTHER, action, true, result, "");
}
- public void logOtherFail(String action, String error){
+ public void logOtherFail(String action, String error) {
logAdmin(LOG_TYPE_OTHER, action, false, error, "");
}
- public void logAdmin (Integer type, String action, Boolean succeed, String result, String comment){
+ public void logAdmin(Integer type, String action, Boolean succeed, String result, String comment) {
LitemallLog log = new LitemallLog();
Subject currentUser = SecurityUtils.getSubject();
- if(currentUser != null) {
+ if (currentUser != null) {
LitemallAdmin admin = (LitemallAdmin) currentUser.getPrincipal();
- if(admin != null) {
+ if (admin != null) {
log.setAdmin(admin.getUsername());
- }
- else{
+ } else {
log.setAdmin("匿名用户");
}
- }
- else{
+ } else {
log.setAdmin("匿名用户");
}
- HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- if(request != null) {
+ HttpServletRequest request =
+ ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ if (request != null) {
log.setIp(IpUtil.getIpAddr(request));
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
index 0c1654bd..505f3ec4 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminAuthorizingRealm.java
@@ -12,8 +12,6 @@ import org.linlinjava.litemall.db.domain.LitemallAdmin;
import org.linlinjava.litemall.db.service.LitemallAdminService;
import org.linlinjava.litemall.db.service.LitemallPermissionService;
import org.linlinjava.litemall.db.service.LitemallRoleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -23,7 +21,6 @@ import java.util.Set;
public class AdminAuthorizingRealm extends AuthorizingRealm {
- private static final Logger log = LoggerFactory.getLogger(AdminAuthorizingRealm.class);
@Autowired
private LitemallAdminService adminService;
@Autowired
@@ -52,7 +49,7 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
UsernamePasswordToken upToken = (UsernamePasswordToken) token;
String username = upToken.getUsername();
- String password=new String(upToken.getPassword());
+ String password = new String(upToken.getPassword());
if (StringUtils.isEmpty(username)) {
throw new AccountException("用户名不能为空");
@@ -64,16 +61,16 @@ public class AdminAuthorizingRealm extends AuthorizingRealm {
List adminList = adminService.findAdmin(username);
Assert.state(adminList.size() < 2, "同一个用户名存在两个账户");
if (adminList.size() == 0) {
- throw new UnknownAccountException("找不到用户（"+username+"）的帐号信息");
+ throw new UnknownAccountException("找不到用户（" + username + "）的帐号信息");
}
LitemallAdmin admin = adminList.get(0);
BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
if (!encoder.matches(password, admin.getPassword())) {
- throw new UnknownAccountException("找不到用户（"+username+"）的帐号信息");
+ throw new UnknownAccountException("找不到用户（" + username + "）的帐号信息");
}
- return new SimpleAuthenticationInfo(admin,password,getName());
+ return new SimpleAuthenticationInfo(admin, password, getName());
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminWebSessionManager.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminWebSessionManager.java
index 46cfdcbb..e2795bbb 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminWebSessionManager.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/shiro/AdminWebSessionManager.java
@@ -17,13 +17,13 @@ public class AdminWebSessionManager extends DefaultWebSessionManager {
@Override
protected Serializable getSessionId(ServletRequest request, ServletResponse response) {
String id = WebUtils.toHttp(request).getHeader(LOGIN_TOKEN_KEY);
- if (!StringUtils.isEmpty(id)) {
+ if (!StringUtils.isEmpty(id)) {
request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE);
request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, id);
request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE);
return id;
- } else {
- return super.getSessionId(request, response);
- }
+ } else {
+ return super.getSessionId(request, response);
+ }
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/AdminTaskStartupRunner.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/AdminTaskStartupRunner.java
new file mode 100644
index 00000000..2a033942
--- /dev/null
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/AdminTaskStartupRunner.java
@@ -0,0 +1,41 @@
+package org.linlinjava.litemall.admin.task;
+
+import org.linlinjava.litemall.core.task.TaskService;
+import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
+import org.linlinjava.litemall.db.service.LitemallGrouponRulesService;
+import org.linlinjava.litemall.db.util.GrouponConstant;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.List;
+
+@Component
+public class AdminTaskStartupRunner implements ApplicationRunner {
+
+ @Autowired
+ private LitemallGrouponRulesService rulesService;
+ @Autowired
+ private TaskService taskService;
+
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ List grouponRulesList = rulesService.queryByStatus(GrouponConstant.RULE_STATUS_ON);
+ for(LitemallGrouponRules grouponRules : grouponRulesList){
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime expire = grouponRules.getExpireTime();
+ if(expire.isBefore(now)) {
+ // 已经过期，则加入延迟队列
+ taskService.addTask(new GrouponRuleExpiredTask(grouponRules.getId(), 0));
+ }
+ else{
+ // 还没过期，则加入延迟队列
+ long delay = ChronoUnit.MILLIS.between(now, expire);
+ taskService.addTask(new GrouponRuleExpiredTask(grouponRules.getId(), delay));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/GrouponRuleExpiredTask.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/GrouponRuleExpiredTask.java
new file mode 100644
index 00000000..8d0f72f6
--- /dev/null
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/task/GrouponRuleExpiredTask.java
@@ -0,0 +1,68 @@
+package org.linlinjava.litemall.admin.task;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.linlinjava.litemall.core.task.Task;
+import org.linlinjava.litemall.core.util.BeanUtil;
+import org.linlinjava.litemall.db.domain.LitemallGroupon;
+import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
+import org.linlinjava.litemall.db.domain.LitemallOrder;
+import org.linlinjava.litemall.db.service.*;
+import org.linlinjava.litemall.db.util.GrouponConstant;
+import org.linlinjava.litemall.db.util.OrderUtil;
+
+import java.util.List;
+
+public class GrouponRuleExpiredTask extends Task {
+ private final Log logger = LogFactory.getLog(GrouponRuleExpiredTask.class);
+ private int grouponRuleId = -1;
+
+ public GrouponRuleExpiredTask(Integer grouponRuleId, long delayInMilliseconds){
+ super("GrouponRuleExpiredTask-" + grouponRuleId, delayInMilliseconds);
+ this.grouponRuleId = grouponRuleId;
+ }
+
+ @Override
+ public void run() {
+ logger.info("系统开始处理延时任务---团购规则过期---" + this.grouponRuleId);
+
+ LitemallOrderService orderService = BeanUtil.getBean(LitemallOrderService.class);
+ LitemallGrouponService grouponService = BeanUtil.getBean(LitemallGrouponService.class);
+ LitemallGrouponRulesService grouponRulesService = BeanUtil.getBean(LitemallGrouponRulesService.class);
+
+ LitemallGrouponRules grouponRules = grouponRulesService.findById(grouponRuleId);
+ if(grouponRules == null){
+ return;
+ }
+ if(!grouponRules.getStatus().equals(GrouponConstant.RULE_STATUS_ON)){
+ return;
+ }
+
+ // 团购活动取消
+ grouponRules.setStatus(GrouponConstant.RULE_STATUS_DOWN_EXPIRE);
+ grouponRulesService.updateById(grouponRules);
+
+ List grouponList = grouponService.queryByRuleId(grouponRuleId);
+ // 用户团购处理
+ for(LitemallGroupon groupon : grouponList){
+ Short status = groupon.getStatus();
+ LitemallOrder order = orderService.findById(groupon.getOrderId());
+ if(status.equals(GrouponConstant.STATUS_NONE)){
+ groupon.setStatus(GrouponConstant.STATUS_FAIL);
+ grouponService.updateById(groupon);
+ }
+ else if(status.equals(GrouponConstant.STATUS_ON)){
+ // 如果团购进行中
+ // (1) 团购设置团购失败等待退款状态
+ groupon.setStatus(GrouponConstant.STATUS_FAIL);
+ grouponService.updateById(groupon);
+ // (2) 团购订单申请退款
+ if(OrderUtil.isPayStatus(order)) {
+ order.setOrderStatus(OrderUtil.STATUS_REFUND);
+ orderService.updateWithOptimisticLocker(order);
+ }
+ }
+ }
+ logger.info("系统结束处理延时任务---团购规则过期---" + this.grouponRuleId);
+ }
+}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/AdminResponseCode.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/AdminResponseCode.java
index f096a295..327df024 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/AdminResponseCode.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/AdminResponseCode.java
@@ -20,5 +20,8 @@ public class AdminResponseCode {
public static final Integer ROLE_NAME_EXIST = 640;
public static final Integer ROLE_SUPER_SUPERMISSION = 641;
public static final Integer ROLE_USER_EXIST = 642;
+ public static final Integer GROUPON_GOODS_UNKNOWN = 650;
+ public static final Integer GROUPON_GOODS_EXISTED = 651;
+ public static final Integer GROUPON_GOODS_OFFLINE = 652;
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/Permission.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/Permission.java
index 5a425165..8960c10b 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/Permission.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/Permission.java
@@ -2,7 +2,6 @@ package org.linlinjava.litemall.admin.util;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
-import org.springframework.web.bind.annotation.RequestMapping;
public class Permission {
private RequiresPermissions requiresPermissions;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java
index 4c9991ac..7b6a0c2a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/util/PermissionUtil.java
@@ -74,8 +74,7 @@ public class PermissionUtil {
leftPerm.setLabel(requiresPermissionsDesc.button());
leftPerm.setApi(api);
perm2.getChildren().add(leftPerm);
- }
- else{
+ } else {
// TODO
// 目前限制Controller里面每个方法的RequiresPermissionsDesc注解是唯一的
// 如果允许相同，可能会造成内部权限不一致。
@@ -100,8 +99,10 @@ public class PermissionUtil {
RequestMapping clazzRequestMapping = AnnotationUtils.findAnnotation(controllerClz, RequestMapping.class);
List methods = MethodUtils.getMethodsListWithAnnotation(controllerClz, RequiresPermissions.class);
for (Method method : methods) {
- RequiresPermissions requiresPermissions = AnnotationUtils.getAnnotation(method, RequiresPermissions.class);
- RequiresPermissionsDesc requiresPermissionsDesc = AnnotationUtils.getAnnotation(method, RequiresPermissionsDesc.class);
+ RequiresPermissions requiresPermissions = AnnotationUtils.getAnnotation(method,
+ RequiresPermissions.class);
+ RequiresPermissionsDesc requiresPermissionsDesc = AnnotationUtils.getAnnotation(method,
+ RequiresPermissionsDesc.class);
if (requiresPermissions == null || requiresPermissionsDesc == null) {
continue;
@@ -143,7 +144,7 @@ public class PermissionUtil {
public static Set listPermissionString(List permissions) {
Set permissionsString = new HashSet<>();
- for(Permission permission : permissions){
+ for (Permission permission : permissions) {
permissionsString.add(permission.getRequiresPermissions().value()[0]);
}
return permissionsString;
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
index 6238f6cf..eaad1c4a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/ad")
@@ -30,7 +27,7 @@ public class AdminAdController {
private LitemallAdService adService;
@RequiresPermissions("admin:ad:list")
- @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "查询")
@GetMapping("/list")
public Object list(String name, String content,
@RequestParam(defaultValue = "1") Integer page,
@@ -38,12 +35,7 @@ public class AdminAdController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List adList = adService.querySelective(name, content, page, limit, sort, order);
- long total = PageInfo.of(adList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", adList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(adList);
}
private Object validate(LitemallAd ad) {
@@ -59,7 +51,7 @@ public class AdminAdController {
}
@RequiresPermissions("admin:ad:create")
- @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallAd ad) {
Object error = validate(ad);
@@ -71,15 +63,15 @@ public class AdminAdController {
}
@RequiresPermissions("admin:ad:read")
- @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
- LitemallAd brand = adService.findById(id);
- return ResponseUtil.ok(brand);
+ LitemallAd ad = adService.findById(id);
+ return ResponseUtil.ok(ad);
}
@RequiresPermissions("admin:ad:update")
- @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallAd ad) {
Object error = validate(ad);
@@ -94,7 +86,7 @@ public class AdminAdController {
}
@RequiresPermissions("admin:ad:delete")
- @RequiresPermissionsDesc(menu={"推广管理" , "广告管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"推广管理", "广告管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallAd ad) {
Integer id = ad.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java
index c6ace8d8..2a487c40 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -18,10 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/address")
@@ -35,7 +31,7 @@ public class AdminAddressController {
private LitemallRegionService regionService;
@RequiresPermissions("admin:address:list")
- @RequiresPermissionsDesc(menu={"用户管理" , "收货地址"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"用户管理", "收货地址"}, button = "查询")
@GetMapping("/list")
public Object list(Integer userId, String name,
@RequestParam(defaultValue = "1") Integer page,
@@ -44,13 +40,6 @@ public class AdminAddressController {
@Order @RequestParam(defaultValue = "desc") String order) {
List addressList = addressService.querySelective(userId, name, page, limit, sort, order);
- long total = PageInfo.of(addressList).getTotal();
-
-
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", addressList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(addressList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
index f00cc6aa..a8bc1b2b 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.SecurityUtils;
@@ -21,9 +20,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static org.linlinjava.litemall.admin.util.AdminResponseCode.*;
@@ -39,7 +36,7 @@ public class AdminAdminController {
private LogHelper logHelper;
@RequiresPermissions("admin:admin:list")
- @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "查询")
@GetMapping("/list")
public Object list(String username,
@RequestParam(defaultValue = "1") Integer page,
@@ -47,12 +44,7 @@ public class AdminAdminController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List adminList = adminService.querySelective(username, page, limit, sort, order);
- long total = PageInfo.of(adminList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", adminList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(adminList);
}
private Object validate(LitemallAdmin admin) {
@@ -71,7 +63,7 @@ public class AdminAdminController {
}
@RequiresPermissions("admin:admin:create")
- @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallAdmin admin) {
Object error = validate(admin);
@@ -95,7 +87,7 @@ public class AdminAdminController {
}
@RequiresPermissions("admin:admin:read")
- @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallAdmin admin = adminService.findById(id);
@@ -103,7 +95,7 @@ public class AdminAdminController {
}
@RequiresPermissions("admin:admin:update")
- @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallAdmin admin) {
Object error = validate(admin);
@@ -128,7 +120,7 @@ public class AdminAdminController {
}
@RequiresPermissions("admin:admin:delete")
- @RequiresPermissionsDesc(menu={"系统管理" , "管理员管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"系统管理", "管理员管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallAdmin admin) {
Integer anotherAdminId = admin.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
index f1ce0541..59becab5 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAuthController.java
@@ -16,9 +16,7 @@ import org.linlinjava.litemall.core.util.IpUtil;
import org.linlinjava.litemall.core.util.JacksonUtil;
import org.linlinjava.litemall.core.util.ResponseUtil;
import org.linlinjava.litemall.db.domain.LitemallAdmin;
-import org.linlinjava.litemall.db.domain.LitemallLog;
import org.linlinjava.litemall.db.service.LitemallAdminService;
-import org.linlinjava.litemall.db.service.LitemallLogService;
import org.linlinjava.litemall.db.service.LitemallPermissionService;
import org.linlinjava.litemall.db.service.LitemallRoleService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -82,7 +80,16 @@ public class AdminAuthController {
adminService.updateById(admin);
logHelper.logAuthSucceed("登录");
- return ResponseUtil.ok(currentUser.getSession().getId());
+
+ // userInfo
+ Map adminInfo = new HashMap();
+ adminInfo.put("nickName", admin.getUsername());
+ adminInfo.put("avatar", admin.getAvatar());
+
+ Map result = new HashMap();
+ result.put("token", currentUser.getSession().getId());
+ result.put("adminInfo", adminInfo);
+ return ResponseUtil.ok(result);
}
/*
@@ -115,7 +122,7 @@ public class AdminAuthController {
data.put("roles", roles);
// NOTE
// 这里需要转换perms结构，因为对于前端而已API形式的权限更容易理解
- data.put("perms", toAPI(permissions));
+ data.put("perms", toApi(permissions));
return ResponseUtil.ok(data);
}
@@ -123,7 +130,7 @@ public class AdminAuthController {
private ApplicationContext context;
private HashMap systemPermissionsMap = null;
- private Collection toAPI(Set permissions) {
+ private Collection toApi(Set permissions) {
if (systemPermissionsMap == null) {
systemPermissionsMap = new HashMap<>();
final String basicPackage = "org.linlinjava.litemall.admin";
@@ -144,7 +151,7 @@ public class AdminAuthController {
apis.clear();
apis.add("*");
return apis;
-// return systemPermissionsMap.values();
+ // return systemPermissionsMap.values();
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
index ebf5fa60..d8cff591 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/brand")
@@ -31,7 +28,7 @@ public class AdminBrandController {
private LitemallBrandService brandService;
@RequiresPermissions("admin:brand:list")
- @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "查询")
@GetMapping("/list")
public Object list(String id, String name,
@RequestParam(defaultValue = "1") Integer page,
@@ -39,12 +36,7 @@ public class AdminBrandController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List brandList = brandService.querySelective(id, name, page, limit, sort, order);
- long total = PageInfo.of(brandList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", brandList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(brandList);
}
private Object validate(LitemallBrand brand) {
@@ -66,7 +58,7 @@ public class AdminBrandController {
}
@RequiresPermissions("admin:brand:create")
- @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallBrand brand) {
Object error = validate(brand);
@@ -78,7 +70,7 @@ public class AdminBrandController {
}
@RequiresPermissions("admin:brand:read")
- @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallBrand brand = brandService.findById(id);
@@ -86,7 +78,7 @@ public class AdminBrandController {
}
@RequiresPermissions("admin:brand:update")
- @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallBrand brand) {
Object error = validate(brand);
@@ -100,7 +92,7 @@ public class AdminBrandController {
}
@RequiresPermissions("admin:brand:delete")
- @RequiresPermissionsDesc(menu={"商场管理" , "品牌管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"商场管理", "品牌管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallBrand brand) {
Integer id = brand.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
index 9bc40264..f22cb5c2 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java
@@ -29,13 +29,13 @@ public class AdminCategoryController {
private LitemallCategoryService categoryService;
@RequiresPermissions("admin:category:list")
- @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "查询")
@GetMapping("/list")
public Object list() {
List categoryVoList = new ArrayList<>();
List categoryList = categoryService.queryByPid(0);
- for(LitemallCategory category : categoryList){
+ for (LitemallCategory category : categoryList) {
CategoryVo categoryVO = new CategoryVo();
categoryVO.setId(category.getId());
categoryVO.setDesc(category.getDesc());
@@ -47,7 +47,7 @@ public class AdminCategoryController {
List children = new ArrayList<>();
List subCategoryList = categoryService.queryByPid(category.getId());
- for(LitemallCategory subCategory : subCategoryList){
+ for (LitemallCategory subCategory : subCategoryList) {
CategoryVo subCategoryVo = new CategoryVo();
subCategoryVo.setId(subCategory.getId());
subCategoryVo.setDesc(subCategory.getDesc());
@@ -64,7 +64,7 @@ public class AdminCategoryController {
categoryVoList.add(categoryVO);
}
- return ResponseUtil.ok(categoryVoList);
+ return ResponseUtil.okList(categoryVoList);
}
private Object validate(LitemallCategory category) {
@@ -90,7 +90,7 @@ public class AdminCategoryController {
}
@RequiresPermissions("admin:category:create")
- @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallCategory category) {
Object error = validate(category);
@@ -102,7 +102,7 @@ public class AdminCategoryController {
}
@RequiresPermissions("admin:category:read")
- @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallCategory category = categoryService.findById(id);
@@ -110,7 +110,7 @@ public class AdminCategoryController {
}
@RequiresPermissions("admin:category:update")
- @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallCategory category) {
Object error = validate(category);
@@ -125,7 +125,7 @@ public class AdminCategoryController {
}
@RequiresPermissions("admin:category:delete")
- @RequiresPermissionsDesc(menu={"商场管理" , "类目管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"商场管理", "类目管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallCategory category) {
Integer id = category.getId();
@@ -148,6 +148,6 @@ public class AdminCategoryController {
d.put("label", category.getName());
data.add(d);
}
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(data);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java
index 154be2c7..3b8d4c65 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCollectController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/collect")
@@ -32,7 +29,7 @@ public class AdminCollectController {
@RequiresPermissions("admin:collect:list")
- @RequiresPermissionsDesc(menu={"用户管理" , "用户收藏"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"用户管理", "用户收藏"}, button = "查询")
@GetMapping("/list")
public Object list(String userId, String valueId,
@RequestParam(defaultValue = "1") Integer page,
@@ -40,11 +37,6 @@ public class AdminCollectController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List collectList = collectService.querySelective(userId, valueId, page, limit, sort, order);
- long total = PageInfo.of(collectList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", collectList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(collectList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java
index da6dcd29..3cc3ae30 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,9 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/comment")
@@ -28,24 +25,19 @@ public class AdminCommentController {
private LitemallCommentService commentService;
@RequiresPermissions("admin:comment:list")
- @RequiresPermissionsDesc(menu={"商品管理" , "评论管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"商品管理", "评论管理"}, button = "查询")
@GetMapping("/list")
public Object list(String userId, String valueId,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List brandList = commentService.querySelective(userId, valueId, page, limit, sort, order);
- long total = PageInfo.of(brandList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", brandList);
-
- return ResponseUtil.ok(data);
+ List commentList = commentService.querySelective(userId, valueId, page, limit, sort, order);
+ return ResponseUtil.okList(commentList);
}
@RequiresPermissions("admin:comment:delete")
- @RequiresPermissionsDesc(menu={"商品管理" , "评论管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"商品管理", "评论管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallComment comment) {
Integer id = comment.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminConfigController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminConfigController.java
index 22a7ce4f..f9232014 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminConfigController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminConfigController.java
@@ -24,7 +24,7 @@ public class AdminConfigController {
private LitemallSystemConfigService systemConfigService;
@RequiresPermissions("admin:config:mall:list")
- @RequiresPermissionsDesc(menu={"配置管理" , "商场配置"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"配置管理", "商场配置"}, button = "详情")
@GetMapping("/mall")
public Object listMall() {
Map data = systemConfigService.listMail();
@@ -32,9 +32,9 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:mall:updateConfigs")
- @RequiresPermissionsDesc(menu={"配置管理" , "商场配置"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"配置管理", "商场配置"}, button = "编辑")
@PostMapping("/mall")
- public Object updateMall(@RequestBody String body ) {
+ public Object updateMall(@RequestBody String body) {
Map data = JacksonUtil.toMap(body);
systemConfigService.updateConfig(data);
SystemConfig.updateConfigs(data);
@@ -42,7 +42,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:express:list")
- @RequiresPermissionsDesc(menu={"配置管理" , "运费配置"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"配置管理", "运费配置"}, button = "详情")
@GetMapping("/express")
public Object listExpress() {
Map data = systemConfigService.listExpress();
@@ -50,7 +50,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:express:updateConfigs")
- @RequiresPermissionsDesc(menu={"配置管理" , "运费配置"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"配置管理", "运费配置"}, button = "编辑")
@PostMapping("/express")
public Object updateExpress(@RequestBody String body) {
Map data = JacksonUtil.toMap(body);
@@ -60,7 +60,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:order:list")
- @RequiresPermissionsDesc(menu={"配置管理" , "订单配置"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"配置管理", "订单配置"}, button = "详情")
@GetMapping("/order")
public Object lisOrder() {
Map data = systemConfigService.listOrder();
@@ -68,7 +68,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:order:updateConfigs")
- @RequiresPermissionsDesc(menu={"配置管理" , "订单配置"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"配置管理", "订单配置"}, button = "编辑")
@PostMapping("/order")
public Object updateOrder(@RequestBody String body) {
Map data = JacksonUtil.toMap(body);
@@ -77,7 +77,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:wx:list")
- @RequiresPermissionsDesc(menu={"配置管理" , "小程序配置"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"配置管理", "小程序配置"}, button = "详情")
@GetMapping("/wx")
public Object listWx() {
Map data = systemConfigService.listWx();
@@ -85,7 +85,7 @@ public class AdminConfigController {
}
@RequiresPermissions("admin:config:wx:updateConfigs")
- @RequiresPermissionsDesc(menu={"配置管理" , "小程序配置"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"配置管理", "小程序配置"}, button = "编辑")
@PostMapping("/wx")
public Object updateWx(@RequestBody String body) {
Map data = JacksonUtil.toMap(body);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
index f7975aa7..ea7cf706 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCouponController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -19,9 +18,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/coupon")
@@ -35,7 +32,7 @@ public class AdminCouponController {
private LitemallCouponUserService couponUserService;
@RequiresPermissions("admin:coupon:list")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "查询")
@GetMapping("/list")
public Object list(String name, Short type, Short status,
@RequestParam(defaultValue = "1") Integer page,
@@ -43,41 +40,32 @@ public class AdminCouponController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List couponList = couponService.querySelective(name, type, status, page, limit, sort, order);
- long total = PageInfo.of(couponList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", couponList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(couponList);
}
@RequiresPermissions("admin:coupon:listuser")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="查询用户")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "查询用户")
@GetMapping("/listuser")
public Object listuser(Integer userId, Integer couponId, Short status,
- @RequestParam(defaultValue = "1") Integer page,
- @RequestParam(defaultValue = "10") Integer limit,
- @Sort @RequestParam(defaultValue = "add_time") String sort,
- @Order @RequestParam(defaultValue = "desc") String order) {
- List couponList = couponUserService.queryList(userId, couponId, status, page, limit, sort, order);
- long total = PageInfo.of(couponList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", couponList);
-
- return ResponseUtil.ok(data);
+ @RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @Sort @RequestParam(defaultValue = "add_time") String sort,
+ @Order @RequestParam(defaultValue = "desc") String order) {
+ List couponList = couponUserService.queryList(userId, couponId, status, page,
+ limit, sort, order);
+ return ResponseUtil.okList(couponList);
}
private Object validate(LitemallCoupon coupon) {
String name = coupon.getName();
- if(StringUtils.isEmpty(name)){
+ if (StringUtils.isEmpty(name)) {
return ResponseUtil.badArgument();
}
return null;
}
@RequiresPermissions("admin:coupon:create")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallCoupon coupon) {
Object error = validate(coupon);
@@ -86,7 +74,7 @@ public class AdminCouponController {
}
// 如果是兑换码类型，则这里需要生存一个兑换码
- if (coupon.getType().equals(CouponConstant.TYPE_CODE)){
+ if (coupon.getType().equals(CouponConstant.TYPE_CODE)) {
String code = couponService.generateCode();
coupon.setCode(code);
}
@@ -96,7 +84,7 @@ public class AdminCouponController {
}
@RequiresPermissions("admin:coupon:read")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallCoupon coupon = couponService.findById(id);
@@ -104,7 +92,7 @@ public class AdminCouponController {
}
@RequiresPermissions("admin:coupon:update")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallCoupon coupon) {
Object error = validate(coupon);
@@ -118,7 +106,7 @@ public class AdminCouponController {
}
@RequiresPermissions("admin:coupon:delete")
- @RequiresPermissionsDesc(menu={"推广管理" , "优惠券管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"推广管理", "优惠券管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallCoupon coupon) {
couponService.deleteById(coupon.getId());
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java
index 5e771b02..603d2b74 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFeedbackController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* @author Yogeek
@@ -35,19 +32,15 @@ public class AdminFeedbackController {
private LitemallFeedbackService feedbackService;
@RequiresPermissions("admin:feedback:list")
- @RequiresPermissionsDesc(menu={"用户管理" , "意见反馈"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"用户管理", "意见反馈"}, button = "查询")
@GetMapping("/list")
public Object list(Integer userId, String username,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List feedbackList = feedbackService.querySelective(userId, username, page, limit, sort, order);
- long total = PageInfo.of(feedbackList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", feedbackList);
-
- return ResponseUtil.ok(data);
+ List feedbackList = feedbackService.querySelective(userId, username, page, limit, sort,
+ order);
+ return ResponseUtil.okList(feedbackList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
index 01dd0beb..d940c32a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminFootprintController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -17,9 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/footprint")
@@ -31,19 +28,15 @@ public class AdminFootprintController {
private LitemallFootprintService footprintService;
@RequiresPermissions("admin:footprint:list")
- @RequiresPermissionsDesc(menu={"用户管理" , "用户足迹"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"用户管理", "用户足迹"}, button = "查询")
@GetMapping("/list")
public Object list(String userId, String goodsId,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort, order);
- long total = PageInfo.of(footprintList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", footprintList);
-
- return ResponseUtil.ok(data);
+ List footprintList = footprintService.querySelective(userId, goodsId, page, limit, sort,
+ order);
+ return ResponseUtil.okList(footprintList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
index edf2792a..c0fe6de0 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsController.java
@@ -27,6 +27,7 @@ public class AdminGoodsController {
/**
* 查询商品
*
+ * @param goodsId
* @param goodsSn
* @param name
* @param page
@@ -38,12 +39,12 @@ public class AdminGoodsController {
@RequiresPermissions("admin:goods:list")
@RequiresPermissionsDesc(menu = {"商品管理", "商品管理"}, button = "查询")
@GetMapping("/list")
- public Object list(String goodsSn, String name,
+ public Object list(Integer goodsId, String goodsSn, String name,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- return adminGoodsService.list(goodsSn, name, page, limit, sort, order);
+ return adminGoodsService.list(goodsId, goodsSn, name, page, limit, sort, order);
}
@GetMapping("/catAndBrand")
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
index 38197984..9fb00669 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGrouponController.java
@@ -1,10 +1,12 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
+import org.linlinjava.litemall.admin.task.GrouponRuleExpiredTask;
+import org.linlinjava.litemall.admin.util.AdminResponseCode;
+import org.linlinjava.litemall.core.task.TaskService;
import org.linlinjava.litemall.core.util.ResponseUtil;
import org.linlinjava.litemall.core.validator.Order;
import org.linlinjava.litemall.core.validator.Sort;
@@ -14,12 +16,15 @@ import org.linlinjava.litemall.db.domain.LitemallGrouponRules;
import org.linlinjava.litemall.db.service.LitemallGoodsService;
import org.linlinjava.litemall.db.service.LitemallGrouponRulesService;
import org.linlinjava.litemall.db.service.LitemallGrouponService;
+import org.linlinjava.litemall.db.util.GrouponConstant;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.time.Duration;
import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -37,46 +42,43 @@ public class AdminGrouponController {
private LitemallGoodsService goodsService;
@Autowired
private LitemallGrouponService grouponService;
+ @Autowired
+ private TaskService taskService;
@RequiresPermissions("admin:groupon:read")
- @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "详情")
@GetMapping("/listRecord")
- public Object listRecord(String grouponId,
+ public Object listRecord(String grouponRuleId,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List grouponList = grouponService.querySelective(grouponId, page, limit, sort, order);
- long total = PageInfo.of(grouponList).getTotal();
+ List grouponList = grouponService.querySelective(grouponRuleId, page, limit, sort, order);
- List> records = new ArrayList<>();
+ List> groupons = new ArrayList<>();
for (LitemallGroupon groupon : grouponList) {
try {
- Map RecordData = new HashMap<>();
+ Map recordData = new HashMap<>();
List subGrouponList = grouponService.queryJoinRecord(groupon.getId());
- LitemallGrouponRules rules = rulesService.queryById(groupon.getRulesId());
+ LitemallGrouponRules rules = rulesService.findById(groupon.getRulesId());
LitemallGoods goods = goodsService.findById(rules.getGoodsId());
- RecordData.put("groupon", groupon);
- RecordData.put("subGroupons", subGrouponList);
- RecordData.put("rules", rules);
- RecordData.put("goods", goods);
+ recordData.put("groupon", groupon);
+ recordData.put("subGroupons", subGrouponList);
+ recordData.put("rules", rules);
+ recordData.put("goods", goods);
- records.add(RecordData);
+ groupons.add(recordData);
} catch (Exception e) {
- e.printStackTrace();
+ logger.error(e.getMessage(), e);
}
}
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", records);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(groupons, grouponList);
}
@RequiresPermissions("admin:groupon:list")
- @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "查询")
@GetMapping("/list")
public Object list(String goodsId,
@RequestParam(defaultValue = "1") Integer page,
@@ -84,12 +86,7 @@ public class AdminGrouponController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List rulesList = rulesService.querySelective(goodsId, page, limit, sort, order);
- long total = PageInfo.of(rulesList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", rulesList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(rulesList);
}
private Object validate(LitemallGrouponRules grouponRules) {
@@ -114,7 +111,7 @@ public class AdminGrouponController {
}
@RequiresPermissions("admin:groupon:update")
- @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallGrouponRules grouponRules) {
Object error = validate(grouponRules);
@@ -122,6 +119,14 @@ public class AdminGrouponController {
return error;
}
+ LitemallGrouponRules rules = rulesService.findById(grouponRules.getId());
+ if(rules == null){
+ return ResponseUtil.badArgumentValue();
+ }
+ if(!rules.getStatus().equals(GrouponConstant.RULE_STATUS_ON)){
+ return ResponseUtil.fail(AdminResponseCode.GROUPON_GOODS_OFFLINE, "团购已经下线");
+ }
+
Integer goodsId = grouponRules.getGoodsId();
LitemallGoods goods = goodsService.findById(goodsId);
if (goods == null) {
@@ -139,7 +144,7 @@ public class AdminGrouponController {
}
@RequiresPermissions("admin:groupon:create")
- @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallGrouponRules grouponRules) {
Object error = validate(grouponRules);
@@ -150,19 +155,28 @@ public class AdminGrouponController {
Integer goodsId = grouponRules.getGoodsId();
LitemallGoods goods = goodsService.findById(goodsId);
if (goods == null) {
- return ResponseUtil.badArgumentValue();
+ return ResponseUtil.fail(AdminResponseCode.GROUPON_GOODS_UNKNOWN, "团购商品不存在");
+ }
+ if(rulesService.countByGoodsId(goodsId) > 0){
+ return ResponseUtil.fail(AdminResponseCode.GROUPON_GOODS_EXISTED, "团购商品已经存在");
}
grouponRules.setGoodsName(goods.getName());
grouponRules.setPicUrl(goods.getPicUrl());
-
+ grouponRules.setStatus(GrouponConstant.RULE_STATUS_ON);
rulesService.createRules(grouponRules);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime expire = grouponRules.getExpireTime();
+ long delay = ChronoUnit.MILLIS.between(now, expire);
+ // 团购过期任务
+ taskService.addTask(new GrouponRuleExpiredTask(grouponRules.getId(), delay));
+
return ResponseUtil.ok(grouponRules);
}
@RequiresPermissions("admin:groupon:delete")
- @RequiresPermissionsDesc(menu={"推广管理" , "团购管理"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"推广管理", "团购管理"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallGrouponRules grouponRules) {
Integer id = grouponRules.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java
index e263cc22..29106d37 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminHistoryController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/history")
@@ -29,19 +26,15 @@ public class AdminHistoryController {
private LitemallSearchHistoryService searchHistoryService;
@RequiresPermissions("admin:history:list")
- @RequiresPermissionsDesc(menu={"用户管理" , "搜索历史"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"用户管理", "搜索历史"}, button = "查询")
@GetMapping("/list")
public Object list(String userId, String keyword,
@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer limit,
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
- List footprintList = searchHistoryService.querySelective(userId, keyword, page, limit, sort, order);
- long total = PageInfo.of(footprintList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", footprintList);
-
- return ResponseUtil.ok(data);
+ List historyList = searchHistoryService.querySelective(userId, keyword, page, limit,
+ sort, order);
+ return ResponseUtil.okList(historyList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java
index d18393cd..2bd7398a 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIndexController.java
@@ -51,14 +51,14 @@ public class AdminIndexController {
}
@RequiresPermissions("index:permission:read")
- @RequiresPermissionsDesc(menu={"其他" , "权限测试"}, button="权限读")
+ @RequiresPermissionsDesc(menu = {"其他", "权限测试"}, button = "权限读")
@GetMapping("/read")
public Object read() {
return ResponseUtil.ok("hello world, this is admin service");
}
@RequiresPermissions("index:permission:write")
- @RequiresPermissionsDesc(menu={"其他" , "权限测试"}, button="权限写")
+ @RequiresPermissionsDesc(menu = {"其他", "权限测试"}, button = "权限写")
@PostMapping("/write")
public Object write() {
return ResponseUtil.ok("hello world, this is admin service");
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
index 4fe819ce..a71c3762 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/issue")
@@ -30,7 +27,7 @@ public class AdminIssueController {
private LitemallIssueService issueService;
@RequiresPermissions("admin:issue:list")
- @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "查询")
@GetMapping("/list")
public Object list(String question,
@RequestParam(defaultValue = "1") Integer page,
@@ -38,12 +35,7 @@ public class AdminIssueController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List issueList = issueService.querySelective(question, page, limit, sort, order);
- long total = PageInfo.of(issueList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", issueList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(issueList);
}
private Object validate(LitemallIssue issue) {
@@ -59,7 +51,7 @@ public class AdminIssueController {
}
@RequiresPermissions("admin:issue:create")
- @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallIssue issue) {
Object error = validate(issue);
@@ -78,7 +70,7 @@ public class AdminIssueController {
}
@RequiresPermissions("admin:issue:update")
- @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallIssue issue) {
Object error = validate(issue);
@@ -93,7 +85,7 @@ public class AdminIssueController {
}
@RequiresPermissions("admin:issue:delete")
- @RequiresPermissionsDesc(menu={"商场管理" , "通用问题"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"商场管理", "通用问题"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallIssue issue) {
Integer id = issue.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
index fd95cf23..6643c864 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -16,9 +15,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/keyword")
@@ -30,7 +27,7 @@ public class AdminKeywordController {
private LitemallKeywordService keywordService;
@RequiresPermissions("admin:keyword:list")
- @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "查询")
@GetMapping("/list")
public Object list(String keyword, String url,
@RequestParam(defaultValue = "1") Integer page,
@@ -38,12 +35,7 @@ public class AdminKeywordController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List keywordList = keywordService.querySelective(keyword, url, page, limit, sort, order);
- long total = PageInfo.of(keywordList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", keywordList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(keywordList);
}
private Object validate(LitemallKeyword keywords) {
@@ -55,19 +47,19 @@ public class AdminKeywordController {
}
@RequiresPermissions("admin:keyword:create")
- @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="添加")
+ @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "添加")
@PostMapping("/create")
- public Object create(@RequestBody LitemallKeyword keywords) {
- Object error = validate(keywords);
+ public Object create(@RequestBody LitemallKeyword keyword) {
+ Object error = validate(keyword);
if (error != null) {
return error;
}
- keywordService.add(keywords);
- return ResponseUtil.ok(keywords);
+ keywordService.add(keyword);
+ return ResponseUtil.ok(keyword);
}
@RequiresPermissions("admin:keyword:read")
- @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="详情")
+ @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallKeyword keyword = keywordService.findById(id);
@@ -75,21 +67,21 @@ public class AdminKeywordController {
}
@RequiresPermissions("admin:keyword:update")
- @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="编辑")
+ @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "编辑")
@PostMapping("/update")
- public Object update(@RequestBody LitemallKeyword keywords) {
- Object error = validate(keywords);
+ public Object update(@RequestBody LitemallKeyword keyword) {
+ Object error = validate(keyword);
if (error != null) {
return error;
}
- if (keywordService.updateById(keywords) == 0) {
+ if (keywordService.updateById(keyword) == 0) {
return ResponseUtil.updatedDataFailed();
}
- return ResponseUtil.ok(keywords);
+ return ResponseUtil.ok(keyword);
}
@RequiresPermissions("admin:keyword:delete")
- @RequiresPermissionsDesc(menu={"商场管理" , "关键词"}, button="删除")
+ @RequiresPermissionsDesc(menu = {"商场管理", "关键词"}, button = "删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallKeyword keyword) {
Integer id = keyword.getId();
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java
index bb72eddf..0edb31cd 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminLogController.java
@@ -1,6 +1,5 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -12,12 +11,12 @@ import org.linlinjava.litemall.db.domain.LitemallLog;
import org.linlinjava.litemall.db.service.LitemallLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
-import javax.validation.constraints.NotNull;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@RestController
@RequestMapping("/admin/log")
@@ -29,7 +28,7 @@ public class AdminLogController {
private LitemallLogService logService;
@RequiresPermissions("admin:log:list")
- @RequiresPermissionsDesc(menu={"系统管理" , "操作日志"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"系统管理", "操作日志"}, button = "查询")
@GetMapping("/list")
public Object list(String name,
@RequestParam(defaultValue = "1") Integer page,
@@ -37,11 +36,6 @@ public class AdminLogController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List logList = logService.querySelective(name, page, limit, sort, order);
- long total = PageInfo.of(logList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", logList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(logList);
}
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
index bacc667b..6dcf777c 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java
@@ -5,6 +5,9 @@ import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
import org.linlinjava.litemall.admin.service.AdminOrderService;
+import org.linlinjava.litemall.core.express.ExpressService;
+import org.linlinjava.litemall.core.notify.NotifyService;
+import org.linlinjava.litemall.core.util.ResponseUtil;
import org.linlinjava.litemall.core.validator.Order;
import org.linlinjava.litemall.core.validator.Sort;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,8 @@ public class AdminOrderController {
@Autowired
private AdminOrderService adminOrderService;
+ @Autowired
+ private ExpressService expressService;
/**
* 查询订单
@@ -47,6 +52,16 @@ public class AdminOrderController {
return adminOrderService.list(userId, orderSn, orderStatusArray, page, limit, sort, order);
}
+ /**
+ * 查询物流公司
+ *
+ * @return
+ */
+ @GetMapping("/channel")
+ public Object channel() {
+ return ResponseUtil.ok(expressService.getVendors());
+ }
+
/**
* 订单详情
*
@@ -99,5 +114,4 @@ public class AdminOrderController {
public Object reply(@RequestBody String body) {
return adminOrderService.reply(body);
}
-
}
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
index 6835f24e..71d32e98 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRegionController.java
@@ -37,17 +37,7 @@ public class AdminRegionController {
public Object list() {
List regionVoList = new ArrayList<>();
- List litemallRegions = regionService.getAll();
- Map> collect = litemallRegions.stream().collect(Collectors.groupingBy(LitemallRegion::getType));
- byte provinceType = 1;
- List provinceList = collect.get(provinceType);
- byte cityType = 2;
- List city = collect.get(cityType);
- Map> cityListMap = city.stream().collect(Collectors.groupingBy(LitemallRegion::getPid));
- byte areaType = 3;
- List areas = collect.get(areaType);
- Map> areaListMap = areas.stream().collect(Collectors.groupingBy(LitemallRegion::getPid));
-
+ List provinceList = regionService.queryByPid(0);
for (LitemallRegion province : provinceList) {
RegionVo provinceVO = new RegionVo();
provinceVO.setId(province.getId());
@@ -57,7 +47,7 @@ public class AdminRegionController {
List cityList = cityListMap.get(province.getId());
List cityVOList = new ArrayList<>();
- for (LitemallRegion cityVo : cityList) {
+ for (LitemallRegion city : cityList) {
RegionVo cityVO = new RegionVo();
cityVO.setId(cityVo.getId());
cityVO.setName(cityVo.getName());
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
index 6d3df828..dd0b3ffb 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminRoleController.java
@@ -1,14 +1,13 @@
package org.linlinjava.litemall.admin.web;
-import com.github.pagehelper.PageInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.linlinjava.litemall.admin.annotation.RequiresPermissionsDesc;
import org.linlinjava.litemall.admin.util.AdminResponseCode;
-import org.linlinjava.litemall.admin.vo.PermVo;
import org.linlinjava.litemall.admin.util.Permission;
import org.linlinjava.litemall.admin.util.PermissionUtil;
+import org.linlinjava.litemall.admin.vo.PermVo;
import org.linlinjava.litemall.core.util.JacksonUtil;
import org.linlinjava.litemall.core.util.ResponseUtil;
import org.linlinjava.litemall.core.validator.Order;
@@ -45,7 +44,7 @@ public class AdminRoleController {
private LitemallAdminService adminService;
@RequiresPermissions("admin:role:list")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色查询")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色查询")
@GetMapping("/list")
public Object list(String name,
@RequestParam(defaultValue = "1") Integer page,
@@ -53,16 +52,11 @@ public class AdminRoleController {
@Sort @RequestParam(defaultValue = "add_time") String sort,
@Order @RequestParam(defaultValue = "desc") String order) {
List roleList = roleService.querySelective(name, page, limit, sort, order);
- long total = PageInfo.of(roleList).getTotal();
- Map data = new HashMap<>();
- data.put("total", total);
- data.put("items", roleList);
-
- return ResponseUtil.ok(data);
+ return ResponseUtil.okList(roleList);
}
@GetMapping("/options")
- public Object options(){
+ public Object options() {
List roleList = roleService.queryAll();
List> options = new ArrayList<>(roleList.size());
@@ -73,11 +67,11 @@ public class AdminRoleController {
options.add(option);
}
- return ResponseUtil.ok(options);
+ return ResponseUtil.okList(options);
}
@RequiresPermissions("admin:role:read")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色详情")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色详情")
@GetMapping("/read")
public Object read(@NotNull Integer id) {
LitemallRole role = roleService.findById(id);
@@ -95,7 +89,7 @@ public class AdminRoleController {
}
@RequiresPermissions("admin:role:create")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色添加")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色添加")
@PostMapping("/create")
public Object create(@RequestBody LitemallRole role) {
Object error = validate(role);
@@ -103,7 +97,7 @@ public class AdminRoleController {
return error;
}
- if (roleService.checkExist(role.getName())){
+ if (roleService.checkExist(role.getName())) {
return ResponseUtil.fail(ROLE_NAME_EXIST, "角色已经存在");
}
@@ -113,7 +107,7 @@ public class AdminRoleController {
}
@RequiresPermissions("admin:role:update")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色编辑")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色编辑")
@PostMapping("/update")
public Object update(@RequestBody LitemallRole role) {
Object error = validate(role);
@@ -126,7 +120,7 @@ public class AdminRoleController {
}
@RequiresPermissions("admin:role:delete")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="角色删除")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "角色删除")
@PostMapping("/delete")
public Object delete(@RequestBody LitemallRole role) {
Integer id = role.getId();
@@ -136,10 +130,10 @@ public class AdminRoleController {
// 如果当前角色所对应管理员仍存在，则拒绝删除角色。
List adminList = adminService.all();
- for(LitemallAdmin admin : adminList){
+ for (LitemallAdmin admin : adminList) {
Integer[] roleIds = admin.getRoleIds();
- for(Integer roleId : roleIds){
- if(id.equals(roleId)){
+ for (Integer roleId : roleIds) {
+ if (id.equals(roleId)) {
return ResponseUtil.fail(ROLE_USER_EXIST, "当前角色存在管理员，不能删除");
}
}
@@ -155,9 +149,9 @@ public class AdminRoleController {
private List systemPermissions = null;
private Set systemPermissionsString = null;
- private List getSystemPermissions(){
+ private List getSystemPermissions() {
final String basicPackage = "org.linlinjava.litemall.admin";
- if(systemPermissions == null){
+ if (systemPermissions == null) {
List permissions = PermissionUtil.listPermission(context, basicPackage);
systemPermissions = PermissionUtil.listPermVo(permissions);
systemPermissionsString = PermissionUtil.listPermissionString(permissions);
@@ -165,15 +159,14 @@ public class AdminRoleController {
return systemPermissions;
}
- private Set getAssignedPermissions(Integer roleId){
+ private Set getAssignedPermissions(Integer roleId) {
// 这里需要注意的是，如果存在超级权限*，那么这里需要转化成当前所有系统权限。
// 之所以这么做，是因为前端不能识别超级权限，所以这里需要转换一下。
Set assignedPermissions = null;
- if(permissionService.checkSuperPermission(roleId)){
+ if (permissionService.checkSuperPermission(roleId)) {
getSystemPermissions();
assignedPermissions = systemPermissionsString;
- }
- else{
+ } else {
assignedPermissions = permissionService.queryByRoleId(roleId);
}
@@ -186,7 +179,7 @@ public class AdminRoleController {
* @return 系统所有权限列表和管理员已分配权限
*/
@RequiresPermissions("admin:role:permission:get")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="权限详情")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "权限详情")
@GetMapping("/permissions")
public Object getPermissions(Integer roleId) {
List systemPermissions = getSystemPermissions();
@@ -206,23 +199,23 @@ public class AdminRoleController {
* @return
*/
@RequiresPermissions("admin:role:permission:update")
- @RequiresPermissionsDesc(menu={"系统管理" , "角色管理"}, button="权限变更")
+ @RequiresPermissionsDesc(menu = {"系统管理", "角色管理"}, button = "权限变更")
@PostMapping("/permissions")
public Object updatePermissions(@RequestBody String body) {
Integer roleId = JacksonUtil.parseInteger(body, "roleId");
List permissions = JacksonUtil.parseStringList(body, "permissions");
- if(roleId == null || permissions == null){
+ if (roleId == null || permissions == null) {
return ResponseUtil.badArgument();
}
// 如果修改的角色是超级权限，则拒绝修改。
- if(permissionService.checkSuperPermission(roleId)){
+ if (permissionService.checkSuperPermission(roleId)) {
return ResponseUtil.fail(AdminResponseCode.ROLE_SUPER_SUPERMISSION, "当前角色的超级权限不能变更");
}
// 先删除旧的权限，再更新新的权限
permissionService.deleteByRoleId(roleId);
- for(String permission : permissions){
+ for (String permission : permissions) {
LitemallPermission litemallPermission = new LitemallPermission();
litemallPermission.setRoleId(roleId);
litemallPermission.setPermission(permission);
diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java
index 90b4a05c..8ff94ff2 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminStatController.java
@@ -26,7 +26,7 @@ public class AdminStatController {
private StatService statService;
@RequiresPermissions("admin:stat:user")
- @RequiresPermissionsDesc(menu={"统计管理" , "用户统计"}, button="查询")
+ @RequiresPermissionsDesc(menu = {"统计管理", "用户统计"}, button = "查询")
@GetMapping("/user")
public Object statUser() {
List