改名

src/main/java/com/izouma/jiashanxia/domain/SetMeal.java → src/main/java/com/izouma/jiashanxia/domain/Package.java

@@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 @Builder
@@ -18,7 +17,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "套餐信息")
-public class SetMeal extends BaseEntity {
+public class Package extends BaseEntity {
 
     @ApiModelProperty(value = "套餐名称")
     private String name;

src/main/java/com/izouma/jiashanxia/domain/SetGoods.java → src/main/java/com/izouma/jiashanxia/domain/PackageGoods.java

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @Entity
 @ApiModel(value = "套餐商品")
 @Where(clause = "del = 0")
-public class SetGoods extends BaseEntity {
+public class PackageGoods extends BaseEntity {
     private Long setMealId;
 
     @ApiModelProperty(value = "名称")

src/main/java/com/izouma/jiashanxia/domain/UserSet.java → src/main/java/com/izouma/jiashanxia/domain/UserPackage.java

@@ -17,7 +17,7 @@ import javax.persistence.Entity;
 @Entity
 @ApiModel(value = "用户套餐")
 @Where(clause = "del = 0")
-public class UserSet extends BaseEntity {
+public class UserPackage extends BaseEntity {
 
     private Long userId;
 

src/main/java/com/izouma/jiashanxia/domain/UserSetFlow.java → src/main/java/com/izouma/jiashanxia/domain/UserPackageFlow.java

@@ -18,7 +18,7 @@ import javax.persistence.*;
 @Builder
 @Data
 @ApiModel(value = "套餐流水")
-public class UserSetFlow extends BaseEntity {
+public class UserPackageFlow extends BaseEntity {
     private Long userId;
 
     @Enumerated(EnumType.STRING)

src/main/java/com/izouma/jiashanxia/dto/StatisticDTO.java

@@ -0,0 +1,18 @@
+package com.izouma.jiashanxia.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class StatisticDTO {
+    private Long          dayOrder;
+    private Long          dayFee;
+    private LocalDateTime dateTime;
+}

src/main/java/com/izouma/jiashanxia/dto/UserSetFlowVO.java → src/main/java/com/izouma/jiashanxia/dto/UserPackageFlowVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @Data
-public class UserSetFlowVO {
+public class UserPackageFlowVO {
     private Long userId;
 
     private FlowType type;

src/main/java/com/izouma/jiashanxia/repo/OrderInfoRepo.java

@@ -1,12 +1,15 @@
 package com.izouma.jiashanxia.repo;
 
 import com.izouma.jiashanxia.domain.OrderInfo;
+import com.izouma.jiashanxia.enums.OrderInfoStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
+import java.util.List;
 
 public interface OrderInfoRepo extends JpaRepository<OrderInfo, Long>, JpaSpecificationExecutor<OrderInfo> {
     @Query("update OrderInfo t set t.del = true where t.id = ?1")
@@ -16,4 +19,8 @@ public interface OrderInfoRepo extends JpaRepository<OrderInfo, Long>, JpaSpecif
 
     @Query(nativeQuery = true, value = "SELECT count(1) FROM order_info")
     int orderNum();
+
+    long countByStatus(OrderInfoStatus status);
+
+    List<OrderInfo> findAllByPaidAtBetweenAndStatus(LocalDateTime paidAt, LocalDateTime paidAt2, OrderInfoStatus status);
 }

src/main/java/com/izouma/jiashanxia/repo/SetGoodsRepo.java → src/main/java/com/izouma/jiashanxia/repo/PackageGoodsRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.repo;
 
-import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.domain.PackageGoods;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -9,11 +9,11 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.util.List;
 
-public interface SetGoodsRepo extends JpaRepository<SetGoods, Long>, JpaSpecificationExecutor<SetGoods> {
-    @Query("update SetGoods t set t.del = true where t.id = ?1")
+public interface PackageGoodsRepo extends JpaRepository<PackageGoods, Long>, JpaSpecificationExecutor<PackageGoods> {
+    @Query("update PackageGoods t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
 
-    List<SetGoods> findAllBySetMealId(Long setId);
+    List<PackageGoods> findAllBySetMealId(Long setId);
 }

src/main/java/com/izouma/jiashanxia/repo/SetMealRepo.java → src/main/java/com/izouma/jiashanxia/repo/PackageRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.repo;
 
-import com.izouma.jiashanxia.domain.SetMeal;
+import com.izouma.jiashanxia.domain.Package;
 import com.izouma.jiashanxia.enums.SetType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -10,11 +10,11 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.util.List;
 
-public interface SetMealRepo extends JpaRepository<SetMeal, Long>, JpaSpecificationExecutor<SetMeal> {
-    @Query("update SetMeal t set t.del = true where t.id = ?1")
+public interface PackageRepo extends JpaRepository<Package, Long>, JpaSpecificationExecutor<Package> {
+    @Query("update Package t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
 
-    List<SetMeal> findAllByType(SetType type);
+    List<Package> findAllByType(SetType type);
 }

src/main/java/com/izouma/jiashanxia/repo/UserSetRepo.java → src/main/java/com/izouma/jiashanxia/repo/UserPackageFlowRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.repo;
 
-import com.izouma.jiashanxia.domain.UserSet;
+import com.izouma.jiashanxia.domain.UserPackageFlow;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -9,11 +9,12 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.util.List;
 
-public interface UserSetRepo extends JpaRepository<UserSet, Long>, JpaSpecificationExecutor<UserSet> {
-    @Query("update UserSet t set t.del = true where t.id = ?1")
+
+public interface UserPackageFlowRepo extends JpaRepository<UserPackageFlow, Long>, JpaSpecificationExecutor<UserPackageFlow> {
+    @Query("update UserPackageFlow t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
 
-    List<UserSet> findAllByUserId(Long userId);
+    List<UserPackageFlow> findAllByUserId(Long userId);
 }

src/main/java/com/izouma/jiashanxia/repo/UserSetFlowRepo.java → src/main/java/com/izouma/jiashanxia/repo/UserPackageRepo.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.repo;
 
-import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.domain.UserPackage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -9,12 +9,11 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.util.List;
 
-
-public interface UserSetFlowRepo extends JpaRepository<UserSetFlow, Long>, JpaSpecificationExecutor<UserSetFlow> {
-    @Query("update UserSetFlow t set t.del = true where t.id = ?1")
+public interface UserPackageRepo extends JpaRepository<UserPackage, Long>, JpaSpecificationExecutor<UserPackage> {
+    @Query("update UserPackage t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
 
-    List<UserSetFlow> findAllByUserId(Long userId);
+    List<UserPackage> findAllByUserId(Long userId);
 }

src/main/java/com/izouma/jiashanxia/repo/WxFeeRepo.java

@@ -2,6 +2,12 @@ package com.izouma.jiashanxia.repo;
 
 import com.izouma.jiashanxia.domain.WxFee;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.math.BigDecimal;
 
 public interface WxFeeRepo extends JpaRepository<WxFee, String> {
+
+    @Query(nativeQuery = true, value = "SELECT SUM(amount) FROM wx_fee WHERE is_refund=false")
+    BigDecimal sumByAmount();
 }

src/main/java/com/izouma/jiashanxia/service/OrderInfoService.java

@@ -3,6 +3,7 @@ package com.izouma.jiashanxia.service;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.izouma.jiashanxia.domain.*;
+import com.izouma.jiashanxia.domain.Package;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.enums.OrderInfoStatus;
 import com.izouma.jiashanxia.enums.PayMethod;
@@ -26,12 +27,12 @@ import java.util.List;
 public class OrderInfoService {
 
     private OrderInfoRepo        orderInfoRepo;
-    private SetMealRepo          setMealRepo;
-    private SetGoodsRepo         setGoodsRepo;
+    private PackageRepo          packageRepo;
+    private PackageGoodsRepo     packageGoodsRepo;
     private UserRepo             userRepo;
     private SysConfigService     sysConfigService;
     private CommissionRecordRepo commissionRecordRepo;
-    private UserSetService       userSetService;
+    private UserPackageService   userPackageService;
     private CompanyRepo          companyRepo;
     private WithdrawService      withdrawService;
 
@@ -61,7 +62,7 @@ public class OrderInfoService {
     下订单
      */
     public OrderInfo creatOrder(Long userId, Long setInfoId, PayMethod payMethod) {
-        SetMeal setInfo = setMealRepo.findById(setInfoId).orElseThrow(new BusinessException("无套餐"));
+        Package setInfo = packageRepo.findById(setInfoId).orElseThrow(new BusinessException("无套餐"));
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
         String localTime = df.format(LocalDateTime.now());
         String num = String.format("%05d", orderInfoRepo.orderNum() + 1);
@@ -90,10 +91,10 @@ public class OrderInfoService {
         orderInfoRepo.save(order);
 
         // 套餐内商品
-        List<SetGoods> setGoodsList = setGoodsRepo.findAllBySetMealId(order.getSetMealId());
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(order.getSetMealId());
         // 加入套餐商品
         Long userId = order.getUserId();
-        userSetService.joinUserSet(userId, setGoodsList);
+        userPackageService.joinUserSet(userId, setGoodsList);
 
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
         if (user.getParent() != null) {

src/main/java/com/izouma/jiashanxia/service/PackageGoodsService.java

@@ -0,0 +1,20 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.domain.PackageGoods;
+import com.izouma.jiashanxia.dto.PageQuery;
+import com.izouma.jiashanxia.repo.PackageGoodsRepo;
+import com.izouma.jiashanxia.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class PackageGoodsService {
+
+    private PackageGoodsRepo packageGoodsRepo;
+
+    public Page<PackageGoods> all(PageQuery pageQuery) {
+        return packageGoodsRepo.findAll(JpaUtils.toSpecification(pageQuery, PackageGoods.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/jiashanxia/service/SetMealService.java → src/main/java/com/izouma/jiashanxia/service/PackageService.java

@@ -2,6 +2,7 @@ package com.izouma.jiashanxia.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.jiashanxia.domain.*;
+import com.izouma.jiashanxia.domain.Package;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.enums.AuthorityName;
 import com.izouma.jiashanxia.enums.OrderInfoStatus;
@@ -24,17 +25,17 @@ import java.util.Set;
 
 @Service
 @AllArgsConstructor
-public class SetMealService {
+public class PackageService {
 
-    private SetMealRepo    setMealRepo;
-    private SetGoodsRepo   setGoodsRepo;
-    private UserSetService userSetService;
-    private CompanyRepo    companyRepo;
-    private UserRepo       userRepo;
-    private OrderInfoRepo  orderInfoRepo;
+    private PackageRepo        packageRepo;
+    private PackageGoodsRepo   packageGoodsRepo;
+    private UserPackageService userPackageService;
+    private CompanyRepo        companyRepo;
+    private UserRepo           userRepo;
+    private OrderInfoRepo      orderInfoRepo;
 
-    public Page<SetMeal> all(PageQuery pageQuery) {
-        return setMealRepo.findAll(JpaUtils.toSpecification(pageQuery, SetMeal.class), JpaUtils.toPageRequest(pageQuery));
+    public Page<Package> all(PageQuery pageQuery) {
+        return packageRepo.findAll(JpaUtils.toSpecification(pageQuery, Package.class), JpaUtils.toPageRequest(pageQuery));
     }
 
     /*
@@ -42,7 +43,7 @@ public class SetMealService {
      */
     public void openTeamSet(Long userId, Long setMealId) {
 
-        SetMeal set = setMealRepo.findById(setMealId).orElseThrow(new BusinessException("无套餐"));
+        Package set = packageRepo.findById(setMealId).orElseThrow(new BusinessException("无套餐"));
         if (!SetType.TEAM.equals(set.getType())) {
             throw new BusinessException("不是团队套餐");
         }
@@ -60,8 +61,8 @@ public class SetMealService {
                 .build());
 
         // 加入套餐商品
-        List<SetGoods> setGoodsList = setGoodsRepo.findAllBySetMealId(setMealId);
-        userSetService.joinUserSet(userId, setGoodsList);
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(setMealId);
+        userPackageService.joinUserSet(userId, setGoodsList);
 
         // 新建公司
         Company company = companyRepo.findByUserId(userId);

src/main/java/com/izouma/jiashanxia/service/SetGoodsService.java

@@ -1,28 +0,0 @@
-package com.izouma.jiashanxia.service;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.izouma.jiashanxia.domain.SetGoods;
-import com.izouma.jiashanxia.domain.UserSet;
-import com.izouma.jiashanxia.domain.UserSetFlow;
-import com.izouma.jiashanxia.dto.GoodsDTO;
-import com.izouma.jiashanxia.dto.PageQuery;
-import com.izouma.jiashanxia.enums.FlowType;
-import com.izouma.jiashanxia.repo.SetGoodsRepo;
-import com.izouma.jiashanxia.utils.JpaUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class SetGoodsService {
-
-    private SetGoodsRepo setGoodsRepo;
-
-    public Page<SetGoods> all(PageQuery pageQuery) {
-        return setGoodsRepo.findAll(JpaUtils.toSpecification(pageQuery, SetGoods.class), JpaUtils.toPageRequest(pageQuery));
-    }
-}

src/main/java/com/izouma/jiashanxia/service/StatisticService.java

@@ -0,0 +1,51 @@
+package com.izouma.jiashanxia.service;
+
+import com.izouma.jiashanxia.dto.StatisticDTO;
+import com.izouma.jiashanxia.enums.OrderInfoStatus;
+import com.izouma.jiashanxia.repo.CompanyRepo;
+import com.izouma.jiashanxia.repo.OrderInfoRepo;
+import com.izouma.jiashanxia.repo.UserRepo;
+import com.izouma.jiashanxia.repo.WxFeeRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class StatisticService {
+    private UserRepo      userRepo;
+    private CompanyRepo   companyRepo;
+    private OrderInfoRepo orderInfoRepo;
+    private WxFeeRepo     wxFeeRepo;
+
+    /*
+    数据总揽
+     */
+    public Map<String, Object> dataOverview() {
+        long user = userRepo.count();
+        long company = companyRepo.count();
+        long order = orderInfoRepo.countByStatus(OrderInfoStatus.PAID);
+        BigDecimal fee = wxFeeRepo.sumByAmount();
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("user", user);
+        data.put("company", company);
+        data.put("order", order);
+        data.put("fee", fee);
+        return data;
+    }
+
+    /*
+    每日订单折线图
+     */
+    public List<StatisticDTO> dayData(Long day) {
+        List<StatisticDTO> dtos = new ArrayList<>();
+        return null;
+
+    }
+}

src/main/java/com/izouma/jiashanxia/service/UserSetFlowService.java → src/main/java/com/izouma/jiashanxia/service/UserPackageFlowService.java

@@ -5,19 +5,17 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.jiashanxia.domain.GoodsInfo;
-import com.izouma.jiashanxia.domain.OrderInfo;
-import com.izouma.jiashanxia.domain.UserSet;
-import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.domain.UserPackage;
+import com.izouma.jiashanxia.domain.UserPackageFlow;
 import com.izouma.jiashanxia.dto.*;
 import com.izouma.jiashanxia.enums.FlowType;
 import com.izouma.jiashanxia.exception.BusinessException;
 import com.izouma.jiashanxia.repo.GoodsInfoRepo;
-import com.izouma.jiashanxia.repo.UserSetFlowRepo;
-import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.repo.UserPackageFlowRepo;
+import com.izouma.jiashanxia.repo.UserPackageRepo;
 import com.izouma.jiashanxia.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.criteria.Predicate;
@@ -26,22 +24,22 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
-public class UserSetFlowService {
+public class UserPackageFlowService {
 
-    private UserSetFlowRepo userSetFlowRepo;
-    private GoodsInfoRepo   goodsInfoRepo;
-    private UserSetRepo     userSetRepo;
+    private UserPackageFlowRepo userPackageFlowRepo;
+    private GoodsInfoRepo       goodsInfoRepo;
+    private UserPackageRepo     userPackageRepo;
 
-    public Page<UserSetFlow> all(PageQuery pageQuery) {
-        return userSetFlowRepo.findAll(JpaUtils.toSpecification(pageQuery, UserSetFlow.class), JpaUtils.toPageRequest(pageQuery));
+    public Page<UserPackageFlow> all(PageQuery pageQuery) {
+        return userPackageFlowRepo.findAll(JpaUtils.toSpecification(pageQuery, UserPackageFlow.class), JpaUtils.toPageRequest(pageQuery));
     }
 
     /*
     核销列表
      */
-    public Page<UserSetFlow> writeOffAll(PageQuery pageQuery) {
-        return userSetFlowRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> and = JpaUtils.toPredicates(pageQuery, UserSetFlow.class, root, criteriaQuery, criteriaBuilder);
+    public Page<UserPackageFlow> writeOffAll(PageQuery pageQuery) {
+        return userPackageFlowRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, UserPackageFlow.class, root, criteriaQuery, criteriaBuilder);
             and.add(criteriaBuilder.equal(root.get("type"), FlowType.WRITE_OFF));
             if (StrUtil.isNotEmpty(pageQuery.getSearch())) {
                 List<Predicate> or = new ArrayList<>();
@@ -56,10 +54,10 @@ public class UserSetFlowService {
         }), JpaUtils.toPageRequest(pageQuery));
     }
 
-    public List<UserSetFlowVO> my(Long userId) {
-        List<UserSetFlowVO> vos = new ArrayList<>();
+    public List<UserPackageFlowVO> my(Long userId) {
+        List<UserPackageFlowVO> vos = new ArrayList<>();
         // 查找用户相关
-        List<UserSetFlow> flows = userSetFlowRepo.findAllByUserId(userId);
+        List<UserPackageFlow> flows = userPackageFlowRepo.findAllByUserId(userId);
 //        Set<Long> goodsId = new HashSet<>();
 //        // 找出相关商品
 //        flows.forEach(flow -> {
@@ -72,7 +70,7 @@ public class UserSetFlowService {
         // 转vo
         flows.forEach(flow -> {
             List<GoodsVO> goodsVOS = this.toGoodsVO(flow.getContent(), goodsMap);
-            UserSetFlowVO vo = new UserSetFlowVO();
+            UserPackageFlowVO vo = new UserPackageFlowVO();
             BeanUtil.copyProperties(flow, vo);
             vo.setContent(goodsVOS);
             vos.add(vo);
@@ -96,19 +94,19 @@ public class UserSetFlowService {
     /*
     核销
     */
-    public UserSetFlow writeOff(WriteOffSaveVO writeOffSaveVO) {
+    public UserPackageFlow writeOff(WriteOffSaveVO writeOffSaveVO) {
         if (writeOffSaveVO.getUserId().equals(writeOffSaveVO.getWriteOffUserId())) {
             throw new BusinessException("不可自己核销自己");
         }
 
         // 用户已有套餐
-        Map<Long, UserSet> userSetMap = userSetRepo.findAllByUserId(writeOffSaveVO.getUserId())
+        Map<Long, UserPackage> userSetMap = userPackageRepo.findAllByUserId(writeOffSaveVO.getUserId())
                 .stream()
-                .collect(Collectors.toMap(UserSet::getGoodsInfoId, userSet -> userSet));
+                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userSet -> userSet));
 
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffSaveVO.getContent(), GoodsDTO.class);
         goodsDTOS.forEach(goodsDTO -> {
-            UserSet userSet = userSetMap.get(goodsDTO.getGoodsInfoId());
+            UserPackage userSet = userSetMap.get(goodsDTO.getGoodsInfoId());
             if (ObjectUtil.isEmpty(userSet)) {
                 throw new BusinessException("无此项目");
             }
@@ -118,8 +116,8 @@ public class UserSetFlowService {
         });
 
         // 保存套餐流水
-        return userSetFlowRepo.save(
-                UserSetFlow.builder()
+        return userPackageFlowRepo.save(
+                UserPackageFlow.builder()
                         .userId(writeOffSaveVO.getUserId())
                         .content(writeOffSaveVO.getContent())
                         .type(FlowType.WRITE_OFF)
@@ -128,7 +126,7 @@ public class UserSetFlowService {
     }
 
     public WriteOffRecordDTO getDTO(Long id) {
-        UserSetFlow writeOffRecord = userSetFlowRepo.findById(id).orElseThrow(new BusinessException("无核销记录"));
+        UserPackageFlow writeOffRecord = userPackageFlowRepo.findById(id).orElseThrow(new BusinessException("无核销记录"));
         // 转vo
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffRecord.getContent(), GoodsDTO.class);
         Set<Long> ids = goodsDTOS.stream().map(GoodsDTO::getGoodsInfoId).collect(Collectors.toSet());

src/main/java/com/izouma/jiashanxia/service/UserSetService.java → src/main/java/com/izouma/jiashanxia/service/UserPackageService.java

@@ -2,17 +2,17 @@ package com.izouma.jiashanxia.service;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.izouma.jiashanxia.domain.SetGoods;
+import com.izouma.jiashanxia.domain.PackageGoods;
 import com.izouma.jiashanxia.domain.User;
-import com.izouma.jiashanxia.domain.UserSet;
-import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.domain.UserPackage;
+import com.izouma.jiashanxia.domain.UserPackageFlow;
 import com.izouma.jiashanxia.dto.GoodsDTO;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.enums.FlowType;
 import com.izouma.jiashanxia.exception.BusinessException;
 import com.izouma.jiashanxia.repo.UserRepo;
-import com.izouma.jiashanxia.repo.UserSetFlowRepo;
-import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.repo.UserPackageFlowRepo;
+import com.izouma.jiashanxia.repo.UserPackageRepo;
 import com.izouma.jiashanxia.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -24,14 +24,14 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
-public class UserSetService {
+public class UserPackageService {
 
-    private UserSetRepo     userSetRepo;
-    private UserSetFlowRepo userSetFlowRepo;
-    private UserRepo        userRepo;
+    private UserPackageRepo     userPackageRepo;
+    private UserPackageFlowRepo userPackageFlowRepo;
+    private UserRepo            userRepo;
 
-    public Page<UserSet> all(PageQuery pageQuery) {
-        return userSetRepo.findAll(JpaUtils.toSpecification(pageQuery, UserSet.class), JpaUtils.toPageRequest(pageQuery));
+    public Page<UserPackage> all(PageQuery pageQuery) {
+        return userPackageRepo.findAll(JpaUtils.toSpecification(pageQuery, UserPackage.class), JpaUtils.toPageRequest(pageQuery));
     }
 
     /*
@@ -39,28 +39,28 @@ public class UserSetService {
 
     用户套餐和企业套餐重叠怎么办？
     */
-    public void joinUserSet(Long userId, List<SetGoods> setGoodsList) {
+    public void joinUserSet(Long userId, List<PackageGoods> setGoodsList) {
         // 用户已有套餐
-        Map<Long, UserSet> userSetMap = userSetRepo.findAllByUserId(userId)
+        Map<Long, UserPackage> userSetMap = userPackageRepo.findAllByUserId(userId)
                 .stream()
-                .collect(Collectors.toMap(UserSet::getGoodsInfoId, userSet -> userSet));
+                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userSet -> userSet));
 
         // 加入用户套餐
         setGoodsList.forEach(setGoods -> {
-            UserSet goods = userSetMap.get(setGoods.getGoodsInfoId());
+            UserPackage goods = userSetMap.get(setGoods.getGoodsInfoId());
             if (ObjectUtil.isNotEmpty(goods)) {
                 goods.setNum(goods.getNum() + setGoods.getNum());
                 goods.setRemark(setGoods.getRemark());
 
             } else {
-                goods = UserSet.builder()
+                goods = UserPackage.builder()
                         .userId(userId)
                         .goodsInfoId(setGoods.getGoodsInfoId())
                         .num(setGoods.getNum())
                         .remark(setGoods.getRemark())
                         .build();
             }
-            userSetRepo.save(goods);
+            userPackageRepo.save(goods);
         });
         // 设置用户为vip
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
@@ -70,7 +70,7 @@ public class UserSetService {
         }
         // 记录套餐流水
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(setGoodsList), GoodsDTO.class);
-        userSetFlowRepo.save(UserSetFlow.builder()
+        userPackageFlowRepo.save(UserPackageFlow.builder()
                 .userId(userId)
                 .type(FlowType.BUY)
                 .content(JSONObject.toJSONString(goodsDTOS))

src/main/java/com/izouma/jiashanxia/web/SetMealController.java → src/main/java/com/izouma/jiashanxia/web/PackageController.java

@@ -1,11 +1,11 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.domain.SetMeal;
+import com.izouma.jiashanxia.domain.Package;
 import com.izouma.jiashanxia.enums.SetType;
-import com.izouma.jiashanxia.service.SetMealService;
+import com.izouma.jiashanxia.service.PackageService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
-import com.izouma.jiashanxia.repo.SetMealRepo;
+import com.izouma.jiashanxia.repo.PackageRepo;
 import com.izouma.jiashanxia.utils.ObjUtils;
 import com.izouma.jiashanxia.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
@@ -18,62 +18,62 @@ import java.io.IOException;
 import java.util.List;
 
 @RestController
-@RequestMapping("/setMeal")
+@RequestMapping("/package")
 @AllArgsConstructor
-public class SetMealController extends BaseController {
-    private SetMealService setMealService;
-    private SetMealRepo    setMealRepo;
+public class PackageController extends BaseController {
+    private PackageService packageService;
+    private PackageRepo    packageRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public SetMeal save(@RequestBody SetMeal record) {
+    public Package save(@RequestBody Package record) {
         if (record.getId() != null) {
-            SetMeal orig = setMealRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            Package orig = packageRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return setMealRepo.save(orig);
+            return packageRepo.save(orig);
         }
-        return setMealRepo.save(record);
+        return packageRepo.save(record);
     }
 
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<SetMeal> all(@RequestBody PageQuery pageQuery) {
-        return setMealService.all(pageQuery);
+    public Page<Package> all(@RequestBody PageQuery pageQuery) {
+        return packageService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
-    public SetMeal get(@PathVariable Long id) {
-        return setMealRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public Package get(@PathVariable Long id) {
+        return packageRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-        setMealRepo.softDelete(id);
+        packageRepo.softDelete(id);
     }
 
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<SetMeal> data = all(pageQuery).getContent();
+        List<Package> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
 
     @GetMapping("/team")
     @ApiOperation("团队套餐")
-    public List<SetMeal> team() {
-        return setMealRepo.findAllByType(SetType.TEAM);
+    public List<Package> team() {
+        return packageRepo.findAllByType(SetType.TEAM);
     }
 
     @PostMapping("/openTeamSet")
     @ApiOperation("开通团队套餐")
     public void openTeamSet(Long userId, Long setMealId) {
-        setMealService.openTeamSet(userId, setMealId);
+        packageService.openTeamSet(userId, setMealId);
     }
 
     @GetMapping("/allList")
-    public List<SetMeal> allList() {
-        return setMealRepo.findAll();
+    public List<Package> allList() {
+        return packageRepo.findAll();
     }
 }
 

src/main/java/com/izouma/jiashanxia/web/SetGoodsController.java → src/main/java/com/izouma/jiashanxia/web/PackageGoodsController.java

@@ -1,16 +1,15 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.domain.SetGoods;
-import com.izouma.jiashanxia.service.SetGoodsService;
+import com.izouma.jiashanxia.domain.PackageGoods;
+import com.izouma.jiashanxia.service.PackageGoodsService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
-import com.izouma.jiashanxia.repo.SetGoodsRepo;
+import com.izouma.jiashanxia.repo.PackageGoodsRepo;
 import com.izouma.jiashanxia.utils.ObjUtils;
 import com.izouma.jiashanxia.utils.excel.ExcelUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,51 +17,51 @@ import java.io.IOException;
 import java.util.List;
 
 @RestController
-@RequestMapping("/setGoods")
+@RequestMapping("/packageGoods")
 @AllArgsConstructor
-public class SetGoodsController extends BaseController {
-    private SetGoodsService setGoodsService;
-    private SetGoodsRepo    setGoodsRepo;
+public class PackageGoodsController extends BaseController {
+    private PackageGoodsService packageGoodsService;
+    private PackageGoodsRepo    packageGoodsRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public SetGoods save(@RequestBody SetGoods record) {
+    public PackageGoods save(@RequestBody PackageGoods record) {
         if (record.getId() != null) {
-            SetGoods orig = setGoodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            PackageGoods orig = packageGoodsRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return setGoodsRepo.save(orig);
+            return packageGoodsRepo.save(orig);
         }
-        return setGoodsRepo.save(record);
+        return packageGoodsRepo.save(record);
     }
 
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<SetGoods> all(@RequestBody PageQuery pageQuery) {
-        return setGoodsService.all(pageQuery);
+    public Page<PackageGoods> all(@RequestBody PageQuery pageQuery) {
+        return packageGoodsService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
-    public SetGoods get(@PathVariable Long id) {
-        return setGoodsRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public PackageGoods get(@PathVariable Long id) {
+        return packageGoodsRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-        setGoodsRepo.softDelete(id);
+        packageGoodsRepo.softDelete(id);
     }
 
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<SetGoods> data = all(pageQuery).getContent();
+        List<PackageGoods> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
 
     @PostMapping("/getSetGoods")
     @ApiOperation("获取套餐内商品信息")
-    public List<SetGoods> getSetGoods(@RequestParam Long setId) {
-        return setGoodsRepo.findAllBySetMealId(setId);
+    public List<PackageGoods> getSetGoods(@RequestParam Long setId) {
+        return packageGoodsRepo.findAllBySetMealId(setId);
     }
 }
 

src/main/java/com/izouma/jiashanxia/web/StatisticController.java

@@ -1,11 +1,9 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.repo.CompanyRepo;
-import com.izouma.jiashanxia.repo.OrderInfoRepo;
-import com.izouma.jiashanxia.repo.UserRepo;
-import com.izouma.jiashanxia.repo.WxFeeRepo;
+import com.izouma.jiashanxia.service.StatisticService;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,14 +13,11 @@ import java.util.Map;
 @RestController
 @RequestMapping("/statistic")
 public class StatisticController {
-    private UserRepo      userRepo;
-    private CompanyRepo   companyRepo;
-    private OrderInfoRepo orderInfoRepo;
-    private WxFeeRepo     wxFeeRepo;
+    private StatisticService statisticService;
 
     @ApiOperation("数据总浏")
+    @GetMapping("/data")
     public Map<String, Object> dataOverview() {
-
-        return null;
+        return statisticService.dataOverview();
     }
 }

src/main/java/com/izouma/jiashanxia/web/UserSetController.java → src/main/java/com/izouma/jiashanxia/web/UserPackageController.java

@@ -1,16 +1,15 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.domain.UserSet;
-import com.izouma.jiashanxia.service.UserSetService;
+import com.izouma.jiashanxia.domain.UserPackage;
+import com.izouma.jiashanxia.service.UserPackageService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
-import com.izouma.jiashanxia.repo.UserSetRepo;
+import com.izouma.jiashanxia.repo.UserPackageRepo;
 import com.izouma.jiashanxia.utils.ObjUtils;
 import com.izouma.jiashanxia.utils.SecurityUtils;
 import com.izouma.jiashanxia.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -18,50 +17,50 @@ import java.io.IOException;
 import java.util.List;
 
 @RestController
-@RequestMapping("/userSet")
+@RequestMapping("/userPackage")
 @AllArgsConstructor
-public class UserSetController extends BaseController {
-    private UserSetService userSetService;
-    private UserSetRepo    userSetRepo;
+public class UserPackageController extends BaseController {
+    private UserPackageService userPackageService;
+    private UserPackageRepo    userPackageRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public UserSet save(@RequestBody UserSet record) {
+    public UserPackage save(@RequestBody UserPackage record) {
         if (record.getId() != null) {
-            UserSet orig = userSetRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            UserPackage orig = userPackageRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return userSetRepo.save(orig);
+            return userPackageRepo.save(orig);
         }
-        return userSetRepo.save(record);
+        return userPackageRepo.save(record);
     }
 
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<UserSet> all(@RequestBody PageQuery pageQuery) {
-        return userSetService.all(pageQuery);
+    public Page<UserPackage> all(@RequestBody PageQuery pageQuery) {
+        return userPackageService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
-    public UserSet get(@PathVariable Long id) {
-        return userSetRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public UserPackage get(@PathVariable Long id) {
+        return userPackageRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-        userSetRepo.softDelete(id);
+        userPackageRepo.softDelete(id);
     }
 
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<UserSet> data = all(pageQuery).getContent();
+        List<UserPackage> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
 
     @GetMapping("/my")
-    public List<UserSet> my() {
-        return userSetRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
+    public List<UserPackage> my() {
+        return userPackageRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
     }
 }
 

src/main/java/com/izouma/jiashanxia/web/UserSetFlowController.java → src/main/java/com/izouma/jiashanxia/web/UserPackageFlowController.java

@@ -1,12 +1,12 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.domain.UserPackageFlow;
 import com.izouma.jiashanxia.dto.WriteOffRecordDTO;
 import com.izouma.jiashanxia.dto.WriteOffSaveVO;
-import com.izouma.jiashanxia.service.UserSetFlowService;
+import com.izouma.jiashanxia.service.UserPackageFlowService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
-import com.izouma.jiashanxia.repo.UserSetFlowRepo;
+import com.izouma.jiashanxia.repo.UserPackageFlowRepo;
 import com.izouma.jiashanxia.utils.ObjUtils;
 import com.izouma.jiashanxia.utils.SecurityUtils;
 import com.izouma.jiashanxia.utils.excel.ExcelUtils;
@@ -21,69 +21,69 @@ import java.io.IOException;
 import java.util.List;
 
 @RestController
-@RequestMapping("/userSetFlow")
+@RequestMapping("/userPackageFlow")
 @AllArgsConstructor
-public class UserSetFlowController extends BaseController {
-    private UserSetFlowService userSetFlowService;
-    private UserSetFlowRepo    userSetFlowRepo;
+public class UserPackageFlowController extends BaseController {
+    private UserPackageFlowService userPackageFlowService;
+    private UserPackageFlowRepo    userPackageFlowRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
-    public UserSetFlow save(@RequestBody UserSetFlow record) {
+    public UserPackageFlow save(@RequestBody UserPackageFlow record) {
         if (record.getId() != null) {
-            UserSetFlow orig = userSetFlowRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            UserPackageFlow orig = userPackageFlowRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            return userSetFlowRepo.save(orig);
+            return userPackageFlowRepo.save(orig);
         }
-        return userSetFlowRepo.save(record);
+        return userPackageFlowRepo.save(record);
     }
 
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
-    public Page<UserSetFlow> all(@RequestBody PageQuery pageQuery) {
-        return userSetFlowService.all(pageQuery);
+    public Page<UserPackageFlow> all(@RequestBody PageQuery pageQuery) {
+        return userPackageFlowService.all(pageQuery);
     }
 
     @GetMapping("/get/{id}")
-    public UserSetFlow get(@PathVariable Long id) {
-        return userSetFlowRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    public UserPackageFlow get(@PathVariable Long id) {
+        return userPackageFlowRepo.findById(id).orElseThrow(new BusinessException("无记录"));
     }
 
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
-        userSetFlowRepo.softDelete(id);
+        userPackageFlowRepo.softDelete(id);
     }
 
     @GetMapping("/excel")
     @ResponseBody
     public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
-        List<UserSetFlow> data = all(pageQuery).getContent();
+        List<UserPackageFlow> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
 
     @GetMapping("/my")
-    public List<UserSetFlow> my() {
-        return userSetFlowRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
+    public List<UserPackageFlow> my() {
+        return userPackageFlowRepo.findAllByUserId(SecurityUtils.getAuthenticatedUser().getId());
     }
 
     @GetMapping("/getDTO/{id}")
     public WriteOffRecordDTO getDTO(@PathVariable Long id) {
-        return userSetFlowService.getDTO(id);
+        return userPackageFlowService.getDTO(id);
     }
 
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/writeOffAll")
     @ApiOperation("核销记录")
-    public Page<UserSetFlow> writeOffAll(@RequestBody PageQuery pageQuery) {
-        return userSetFlowService.writeOffAll(pageQuery);
+    public Page<UserPackageFlow> writeOffAll(@RequestBody PageQuery pageQuery) {
+        return userPackageFlowService.writeOffAll(pageQuery);
     }
 
     @PreAuthorize("hasAnyAuthority('ADMIN','WRITER')")
     @PostMapping("/writeOff")
     @ApiOperation("核销")
-    public UserSetFlow writeOff(@RequestBody WriteOffSaveVO vo) {
-        return userSetFlowService.writeOff(vo);
+    public UserPackageFlow writeOff(@RequestBody WriteOffSaveVO vo) {
+        return userPackageFlowService.writeOff(vo);
     }
 
 }

src/main/vue/src/router.js

@@ -154,17 +154,17 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/setMealEdit',
-                    name: 'SetMealEdit',
-                    component: () => import(/* webpackChunkName: "setInfoEdit" */ '@/views/SetMealEdit.vue'),
+                    path: '/packageEdit',
+                    name: 'PackageEdit',
+                    component: () => import(/* webpackChunkName: "packageEdit" */ '@/views/PackageEdit.vue'),
                     meta: {
                         title: '套餐信息编辑'
                     }
                 },
                 {
-                    path: '/setMealList',
-                    name: 'SetMealList',
-                    component: () => import(/* webpackChunkName: "setInfoList" */ '@/views/SetMealList.vue'),
+                    path: '/packageList',
+                    name: 'PackageList',
+                    component: () => import(/* webpackChunkName: "packageList" */ '@/views/PackageList.vue'),
                     meta: {
                         title: '套餐信息'
                     }
@@ -178,17 +178,17 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/setGoodsEdit',
-                    name: 'SetGoodsEdit',
-                    component: () => import(/* webpackChunkName: "setGoodsEdit" */ '@/views/SetGoodsEdit.vue'),
+                    path: '/packageGoodsEdit',
+                    name: 'PackageGoodsEdit',
+                    component: () => import(/* webpackChunkName: "packageGoodsEdit" */ '@/views/PackageGoodsEdit.vue'),
                     meta: {
                         title: '套餐内商品编辑'
                     }
                 },
                 {
-                    path: '/setGoodsList',
-                    name: 'SetGoodsList',
-                    component: () => import(/* webpackChunkName: "setGoodsList" */ '@/views/SetGoodsList.vue'),
+                    path: '/packageGoodsList',
+                    name: 'PackageGoodsList',
+                    component: () => import(/* webpackChunkName: "packageGoodsList" */ '@/views/PackageGoodsList.vue'),
                     meta: {
                         title: '套餐内商品'
                     }
@@ -210,33 +210,33 @@ const router = new Router({
                     }
                 },
                 {
-                    path: '/userSetEdit',
-                    name: 'UserSetEdit',
-                    component: () => import(/* webpackChunkName: "userSetEdit" */ '@/views/UserSetEdit.vue'),
+                    path: '/userPackageEdit',
+                    name: 'UserPackageEdit',
+                    component: () => import(/* webpackChunkName: "userPackageEdit" */ '@/views/UserPackageEdit.vue'),
                     meta: {
                         title: '用户套餐编辑'
                     }
                 },
                 {
-                    path: '/userSetList',
-                    name: 'UserSetList',
-                    component: () => import(/* webpackChunkName: "userSetList" */ '@/views/UserSetList.vue'),
+                    path: '/userPackageList',
+                    name: 'UserPackageList',
+                    component: () => import(/* webpackChunkName: "userPackageList" */ '@/views/UserPackageList.vue'),
                     meta: {
                         title: '用户套餐'
                     }
                 },
                 {
-                    path: '/userSetFlowEdit',
-                    name: 'UserSetFlowEdit',
-                    component: () => import(/* webpackChunkName: "userSetFlowEdit" */ '@/views/UserSetFlowEdit.vue'),
+                    path: '/userPackageFlowEdit',
+                    name: 'UserPackageFlowEdit',
+                    component: () => import(/* webpackChunkName: "userPackageFlowEdit" */ '@/views/UserPackageFlowEdit.vue'),
                     meta: {
                         title: '用户套餐流水编辑'
                     }
                 },
                 {
-                    path: '/userSetFlowList',
-                    name: 'UserSetFlowList',
-                    component: () => import(/* webpackChunkName: "userSetFlowList" */ '@/views/UserSetFlowList.vue'),
+                    path: '/userPackageFlowList',
+                    name: 'UserPackageFlowList',
+                    component: () => import(/* webpackChunkName: "userPackageFlowList" */ '@/views/UserPackageFlowList.vue'),
                     meta: {
                         title: '用户套餐流水'
                     }

src/test/java/com/izouma/jiashanxia/repo/UserSetFlowRepoTest.java → src/test/java/com/izouma/jiashanxia/repo/UserPackageFlowRepoTest.java

@@ -1,8 +1,8 @@
 package com.izouma.jiashanxia.repo;
 
 import com.alibaba.fastjson.JSONObject;
-import com.izouma.jiashanxia.domain.SetGoods;
-import com.izouma.jiashanxia.domain.UserSetFlow;
+import com.izouma.jiashanxia.domain.PackageGoods;
+import com.izouma.jiashanxia.domain.UserPackageFlow;
 import com.izouma.jiashanxia.dto.GoodsDTO;
 import com.izouma.jiashanxia.enums.FlowType;
 import org.junit.Test;
@@ -15,18 +15,18 @@ import java.util.List;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
-public class UserSetFlowRepoTest {
+public class UserPackageFlowRepoTest {
     @Autowired
-    private UserSetFlowRepo userSetFlowRepo;
+    private UserPackageFlowRepo userPackageFlowRepo;
     @Autowired
-    private SetGoodsRepo    setGoodsRepo;
+    private PackageGoodsRepo    packageGoodsRepo;
 
     @Test
     public void test() {
-        List<SetGoods> setGoodsList = setGoodsRepo.findAllBySetMealId(17L);
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(17L);
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(setGoodsList), GoodsDTO.class);
         String str = JSONObject.toJSONString(goodsDTOS);
-        userSetFlowRepo.save(UserSetFlow.builder()
+        userPackageFlowRepo.save(UserPackageFlow.builder()
                 .userId(2L)
                 .type(FlowType.BUY)
                 .content(str)

src/test/java/com/izouma/jiashanxia/service/UserSetFlowServiceTest.java → src/test/java/com/izouma/jiashanxia/service/UserPackageFlowServiceTest.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.service;
 
-import com.izouma.jiashanxia.dto.UserSetFlowVO;
+import com.izouma.jiashanxia.dto.UserPackageFlowVO;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,19 +9,17 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 @SpringBootTest
 @RunWith(SpringRunner.class)
-public class UserSetFlowServiceTest {
+public class UserPackageFlowServiceTest {
 
     @Autowired
-    private UserSetFlowService userSetFlowService;
+    private UserPackageFlowService userPackageFlowService;
 
     @Test
     public void my() {
         // 810ms 3012ms
-        List<UserSetFlowVO> my = userSetFlowService.my(2L);
+        List<UserPackageFlowVO> my = userPackageFlowService.my(2L);
         my.forEach(System.out::println);
     }
 }

src/test/java/com/izouma/jiashanxia/service/UserSetServiceTest.java → src/test/java/com/izouma/jiashanxia/service/UserPackageServiceTest.java

@@ -9,9 +9,9 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 @SpringBootTest
 @RunWith(SpringRunner.class)
-public class UserSetServiceTest {
+public class UserPackageServiceTest {
     @Autowired
-    public UserSetService userSetService;
+    public UserPackageService userPackageService;
 
 
     @Test