团购重构

alien-entity/src/main/java/shop/alien/entity/store/LifeGroupBuyMain.java

@@ -32,9 +32,9 @@ public class LifeGroupBuyMain {
     private Integer groupType;
 
     /**
-     * 状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束)
+     * 状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束/8=2+手动下架)
      */
-    @ApiModelProperty(value = "状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束)")
+    @ApiModelProperty(value = "状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束/8=2+手动下架)")
     @TableField("status")
     private Integer status;
 

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -5,12 +5,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import shop.alien.entity.store.LifeGroupBuyThali;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 团购
@@ -188,7 +186,7 @@ public class LifeGroupBuyThaliVo {
      */
     @ApiModelProperty(value = "发票类型(0电子发票/1纸质发票)")
     @TableField("invoice_type")
-    private Integer invoiceType;
+    private String invoiceType;
 
     /**
      * 发票说明

alien-store/src/main/java/shop/alien/store/controller/LifeGroupBuyController.java

@@ -40,7 +40,7 @@ public class LifeGroupBuyController {
     @ApiImplicitParams({@ApiImplicitParam(name = "page", value = "页数", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "size", value = "页容", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "storeId", value = "门店id", dataType = "String", paramType = "query", required = true),
-            @ApiImplicitParam(name = "status", value = "状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束)", dataType = "String", paramType = "query", required = false),
+            @ApiImplicitParam(name = "status", value = "状态(0草稿/1待审核/2未开始/3审核拒绝/4已售罄/5进行中/6已下架/7已结束/8=2+手动下架)", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "groupName", value = "名称", dataType = "String", paramType = "query", required = false),
             @ApiImplicitParam(name = "groupType", value = "团购类型", dataType = "String", paramType = "query", required = false)
     })

alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupBuyServiceImpl.java

@@ -1,5 +1,6 @@
 package shop.alien.store.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -18,6 +19,7 @@ import shop.alien.entity.store.vo.LifeGroupBuyThaliVo;
 import shop.alien.entity.store.vo.StoreMenuVo;
 import shop.alien.mapper.*;
 import shop.alien.store.service.LifeGroupBuyService;
+import shop.alien.util.common.JwtUtil;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -41,20 +43,28 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
 
     @Override
     public boolean saveThali(LifeGroupBuyDto lifeGroupBuyDto) {
+        JSONObject currentUserInfo = JwtUtil.getCurrentUserInfo();
+        Integer userId = null;
+        if (!ObjectUtils.isEmpty(currentUserInfo)) {
+            userId = currentUserInfo.getInteger("userId");
+        }
         LifeGroupBuyMain lifeGroupBuyMain = lifeGroupBuyDto.getLifeGroupBuyMain();
         List<LifeGroupBuyThali> lifeGroupBuyThalis = lifeGroupBuyDto.getLifeGroupBuyThalis();
         if (ObjectUtils.isEmpty(lifeGroupBuyMain.getId())) {
+            lifeGroupBuyMain.setCreatedUserId(userId);
             lifeGroupBuyMainMapper.insert(lifeGroupBuyMain);
             if (ObjectUtils.isNotEmpty(lifeGroupBuyThalis)) {
                 for (int i = 0; i < lifeGroupBuyThalis.size(); i++) {
                     LifeGroupBuyThali lifeGroupBuyThali = lifeGroupBuyThalis.get(i);
                     lifeGroupBuyThali.setParentId(lifeGroupBuyMain.getId().toString());
                     lifeGroupBuyThali.setDetailSort(i + 1);
+                    lifeGroupBuyThali.setCreatedUserId(userId);
                     lifeGroupBuyThaliMapper.insert(lifeGroupBuyThali);
                 }
             }
             return true;
         } else {
+            lifeGroupBuyMain.setUpdatedUserId(userId);
             lifeGroupBuyMainMapper.updateById(lifeGroupBuyMain);
             lifeGroupBuyThaliMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyThali>().eq(LifeGroupBuyThali::getParentId, lifeGroupBuyMain.getId()).set(LifeGroupBuyThali::getDeleteFlag, 1));
             if (ObjectUtils.isNotEmpty(lifeGroupBuyThalis)) {
@@ -62,6 +72,7 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
                     LifeGroupBuyThali lifeGroupBuyThali = lifeGroupBuyThalis.get(i);
                     lifeGroupBuyThali.setParentId(lifeGroupBuyMain.getId().toString());
                     lifeGroupBuyThali.setDetailSort(i + 1);
+                    lifeGroupBuyThali.setCreatedUserId(userId);
                     lifeGroupBuyThaliMapper.insert(lifeGroupBuyThali);
                 }
             }
@@ -106,7 +117,7 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
 
         Map<String, List<LifeGroupBuyThali>> collect = lifeGroupBuyThalis.stream().collect(Collectors.groupingBy(LifeGroupBuyThali::getGroupName));
         List<LifeGroupBuyNameThaliVo> resultMap = new ArrayList<>();
-        List<String> keys = collect.entrySet().stream().sorted(Comparator.comparingInt(i -> i.getValue().stream().map(LifeGroupBuyThali::getDetailSort).reduce(0, Integer::sum))).map(Map.Entry::getKey).collect(Collectors.toList());
+        List<String> keys = collect.entrySet().stream().sorted(Comparator.comparingInt(i -> i.getValue().get(0).getDetailSort())).map(Map.Entry::getKey).collect(Collectors.toList());
         for (String key : keys) {
             LifeGroupBuyNameThaliVo lifeGroupBuyNameThaliVo = new LifeGroupBuyNameThaliVo();
             lifeGroupBuyNameThaliVo.setGroupName(key);