分类

src/main/java/com/izouma/jiashanxia/domain/Category.java

@@ -0,0 +1,26 @@
+package com.izouma.jiashanxia.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel("分类设置")
+public class Category extends BaseEntity {
+
+    private String name;
+
+    private Long parent;
+
+    @ApiModelProperty(value = "多次使用")
+    private boolean repeatedly;
+}

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

@@ -24,8 +24,8 @@ public class UserPackage extends BaseEntity {
 
     private Long userId;
 
-    @ApiModelProperty(value = "用户套餐id")
-    private Long userPackagePeriodId;
+//    @ApiModelProperty(value = "用户套餐id")
+//    private Long userPackagePeriodId;
 
     private Long goodsInfoId;
 

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

@@ -30,8 +30,8 @@ public class UserPackageFlow extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private PackageType packageType;
 
-    @ApiModelProperty(value = "套餐有效期id")
-    private Long userPackagePeriodId;
+//    @ApiModelProperty(value = "套餐有效期id")
+//    private Long userPackagePeriodId;
 
     /*
     存储内容

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

@@ -26,8 +26,8 @@ public class WriteOffSaveVO extends BaseEntity {
     @ApiModelProperty(value = "类型")
     private PackageType type;
 
-    @ApiModelProperty(value = "套餐有效期id")
-    private Long userPackagePeriodId;
+//    @ApiModelProperty(value = "套餐有效期id")
+//    private Long userPackagePeriodId;
 
     /*
     存储内容

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

@@ -19,7 +19,7 @@ public interface UserPackageRepo extends JpaRepository<UserPackage, Long>, JpaSp
 
     List<UserPackage> findAllByUserIdAndType(Long userId, PackageType type);
 
-    List<UserPackage> findAllByUserPackagePeriodId(Long userPackagePeriodId);
+//    List<UserPackage> findAllByUserPackagePeriodId(Long userPackagePeriodId);
 
     @Query("update UserPackage t set t.userId = ?2 where t.userId = ?1 and t.type = 'TEAM'")
     @Modifying

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

@@ -132,24 +132,24 @@ public class UserPackageFlowService {
         }
 
         // 用户已有套餐
-//        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserIdAndType(writeOffSaveVO.getUserId(), writeOffSaveVO
-//                .getType())
-//                .stream()
-//                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userPackage -> userPackage));
+        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserIdAndType(writeOffSaveVO.getUserId(), writeOffSaveVO
+                .getType())
+                .stream()
+                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userPackage -> userPackage));
 
         // 套餐有效期
-        UserPackagePeriod userPackagePeriod = userPackagePeriodRepo.findById(writeOffSaveVO.getUserPackagePeriodId())
-                .orElseThrow(new BusinessException("无套餐"));
-        LocalDateTime now = LocalDateTime.now();
-
-        if (ObjectUtil.isNotEmpty(userPackagePeriod.getEndDate()) && userPackagePeriod.getEndDate().isBefore(now)) {
-            throw new BusinessException("套餐已过期");
-        }
+//        UserPackagePeriod userPackagePeriod = userPackagePeriodRepo.findById(writeOffSaveVO.getUserPackagePeriodId())
+//                .orElseThrow(new BusinessException("无套餐"));
+//        LocalDateTime now = LocalDateTime.now();
+//
+//        if (ObjectUtil.isNotEmpty(userPackagePeriod.getEndDate()) && userPackagePeriod.getEndDate().isBefore(now)) {
+//            throw new BusinessException("套餐已过期");
+//        }
 
         // 核销套餐内容
-        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserPackagePeriodId(writeOffSaveVO.getUserPackagePeriodId())
-                .stream()
-                .collect(Collectors.toMap(UserPackage::getId, userPackage -> userPackage));
+//        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserPackagePeriodId(writeOffSaveVO.getUserPackagePeriodId())
+//                .stream()
+//                .collect(Collectors.toMap(UserPackage::getId, userPackage -> userPackage));
 
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffSaveVO.getContent(), GoodsDTO.class);
         goodsDTOS.forEach(goodsDTO -> {
@@ -170,11 +170,11 @@ public class UserPackageFlowService {
         });
 
         // 触发有效期
-        if (ObjectUtil.isEmpty(userPackagePeriod.getUseDate())) {
-            userPackagePeriod.setUseDate(now);
-            userPackagePeriod.setEndDate(now.toLocalDate().atTime(23, 59, 59));
-            userPackagePeriodRepo.save(userPackagePeriod);
-        }
+//        if (ObjectUtil.isEmpty(userPackagePeriod.getUseDate())) {
+//            userPackagePeriod.setUseDate(now);
+//            userPackagePeriod.setEndDate(now.toLocalDate().atTime(23, 59, 59));
+//            userPackagePeriodRepo.save(userPackagePeriod);
+//        }
 
         // 保存套餐流水
         String content = JSONObject.toJSONString(goodsDTOS);
@@ -183,7 +183,7 @@ public class UserPackageFlowService {
                         .userId(writeOffSaveVO.getUserId())
                         .content(content)
                         .type(FlowType.WRITE_OFF)
-                        .userPackagePeriodId(writeOffSaveVO.getUserPackagePeriodId())
+//                        .userPackagePeriodId(writeOffSaveVO.getUserPackagePeriodId())
                         .packageType(writeOffSaveVO.getType())
                         .writeOffUserId(writeOffSaveVO.getWriteOffUserId())
                         .build());