套餐/流水修改

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

@@ -1,7 +1,7 @@
 package com.izouma.jiashanxia.domain;
 
 import com.izouma.jiashanxia.converter.StringArrayConverter;
-import com.izouma.jiashanxia.enums.SetType;
+import com.izouma.jiashanxia.enums.PackageType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -38,8 +38,9 @@ public class Package extends BaseEntity {
     @ApiModelProperty(value = "详情")
     private String detail;
 
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "套餐类型")
-    private SetType type;
+    private PackageType type;
 
     @ApiModelProperty(value = "图")
     @Column(columnDefinition = "TEXT")

src/main/java/com/izouma/jiashanxia/enums/SetType.java → src/main/java/com/izouma/jiashanxia/enums/PackageType.java

@@ -1,6 +1,6 @@
 package com.izouma.jiashanxia.enums;
 
-public enum SetType {
+public enum PackageType {
     TEAM,
     PERSONAL
 }

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

@@ -1,7 +1,7 @@
 package com.izouma.jiashanxia.repo;
 
 import com.izouma.jiashanxia.domain.Package;
-import com.izouma.jiashanxia.enums.SetType;
+import com.izouma.jiashanxia.enums.PackageType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -16,5 +16,5 @@ public interface PackageRepo extends JpaRepository<Package, Long>, JpaSpecificat
     @Transactional
     void softDelete(Long id);
 
-    List<Package> findAllByType(SetType type);
+    List<Package> findAllByType(PackageType type);
 }

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

@@ -7,7 +7,7 @@ import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.enums.AuthorityName;
 import com.izouma.jiashanxia.enums.OrderInfoStatus;
 import com.izouma.jiashanxia.enums.PayMethod;
-import com.izouma.jiashanxia.enums.SetType;
+import com.izouma.jiashanxia.enums.PackageType;
 import com.izouma.jiashanxia.exception.BusinessException;
 import com.izouma.jiashanxia.repo.*;
 import com.izouma.jiashanxia.security.Authority;
@@ -44,7 +44,7 @@ public class PackageService {
     public void openTeamSet(Long userId, Long packageId) {
 
         Package set = packageRepo.findById(packageId).orElseThrow(new BusinessException("无套餐"));
-        if (!SetType.TEAM.equals(set.getType())) {
+        if (!PackageType.TEAM.equals(set.getType())) {
             throw new BusinessException("不是团队套餐");
         }
         // 新建订单

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

@@ -39,6 +39,7 @@ public class UserPackageFlowService {
     核销列表
      */
     public Page<UserPackageFlow> writeOffAll(PageQuery pageQuery) {
+        pageQuery.setSort("createdAt,desc");
         return userPackageFlowRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils
                     .toPredicates(pageQuery, UserPackageFlow.class, root, criteriaQuery, criteriaBuilder);
@@ -57,6 +58,7 @@ public class UserPackageFlowService {
     }
 
     public Page<UserPackageFlowVO> writeOffAll1(PageQuery pageQuery) {
+        pageQuery.setSort("createdAt,desc");
         Map<Long, String> goodsMap = goodsInfoRepo.findAll()
                 .stream()
                 .collect(Collectors.toMap(GoodsInfo::getId, GoodsInfo::getName));
@@ -149,13 +151,15 @@ public class UserPackageFlowService {
             }
             userPackage.setNum(userPackage.getNum() - goodsDTO.getNum());
             userPackageRepo.save(userPackage);
+            goodsDTO.setNum(-goodsDTO.getNum());
         });
 
         // 保存套餐流水
+        String content = JSONObject.toJSONString(goodsDTOS);
         return userPackageFlowRepo.save(
                 UserPackageFlow.builder()
                         .userId(writeOffSaveVO.getUserId())
-                        .content(writeOffSaveVO.getContent())
+                        .content(content)
                         .type(FlowType.WRITE_OFF)
                         .writeOffUserId(writeOffSaveVO.getWriteOffUserId())
                         .build());

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

@@ -1,7 +1,7 @@
 package com.izouma.jiashanxia.web;
 
 import com.izouma.jiashanxia.domain.Package;
-import com.izouma.jiashanxia.enums.SetType;
+import com.izouma.jiashanxia.enums.PackageType;
 import com.izouma.jiashanxia.service.PackageService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.List;
 
 @RestController
@@ -39,6 +40,7 @@ public class PackageController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<Package> all(@RequestBody PageQuery pageQuery) {
+        pageQuery.setSort("type,asc");
         return packageService.all(pageQuery);
     }
 
@@ -62,7 +64,7 @@ public class PackageController extends BaseController {
     @GetMapping("/team")
     @ApiOperation("团队套餐")
     public List<Package> team() {
-        return packageRepo.findAllByType(SetType.TEAM);
+        return packageRepo.findAllByType(PackageType.TEAM);
     }
 
     @PostMapping("/openTeamSet")

src/main/vue/package-lock.json

@@ -12083,7 +12083,7 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.6.10",
+      "version": "2.6.12",
       "resolved": "https://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.6.10.tgz",
       "integrity": "sha1-MjtPNJXwT6o1AzN6gvXWUHeZycw=",
       "dev": true,

src/main/vue/src/components/PackageEdit.vue

@@ -7,13 +7,13 @@
             label-width="80px"
             label-position="right"
             size="small"
-            style="max-width: 500px;"
+            style="max-width: 800px;"
         >
             <el-form-item prop="name" label="套餐名称">
-                <el-input v-model="formData.name"></el-input>
+                <el-input v-model="formData.name" class="input-title"></el-input>
             </el-form-item>
             <el-form-item prop="title" label="标题">
-                <el-input v-model="formData.title"></el-input>
+                <el-input v-model="formData.title" class="input-title"></el-input>
             </el-form-item>
             <el-form-item prop="img" label="图">
                 <multi-upload v-model="formData.img"></multi-upload>
@@ -199,4 +199,7 @@ export default {
     margin-left: 10px;
     vertical-align: bottom;
 }
+.input-title {
+    width: 350px;
+}
 </style>

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

@@ -1,5 +1,6 @@
 package com.izouma.jiashanxia.service;
 
+import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.dto.UserPackageFlowVO;
 import com.izouma.jiashanxia.dto.WriteOffSaveVO;
 import org.junit.Test;
@@ -29,7 +30,12 @@ public class UserPackageFlowServiceTest {
         userPackageFlowService.writeOff(WriteOffSaveVO.builder()
                 .userId(40L)
                 .writeOffUserId(1L)
-                .content("[{\"goodsInfoId\":11,\"num\":1},{\"goodsInfoId\":12,\"num\":1}]")
+                .content("[{\"goodsInfoId\":13,\"num\":1}]")
                 .build());
     }
+
+    @Test
+    public void test1() {
+        System.out.println(userPackageFlowService.writeOffAll1(new PageQuery()));
+    }
 }