核销修改

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class GoodsDTO {
+    private Long    userPackageId;
     private Long    goodsInfoId;
     private Integer num;
 }

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

@@ -3,6 +3,8 @@ package com.izouma.jiashanxia.dto;
 public interface UserPackageDTO {
     Long getId();
 
+    Long getUserPackageId();
+
     String getName();
 
     String getUnit();

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

@@ -24,7 +24,7 @@ public class WriteOffSaveVO extends BaseEntity {
 
     /*
     存储内容
-    [{"goodsInfoId":11,"num":1},{"goodsInfoId":12,"num":1},{"goodsInfoId":13,"num":4}]
+    [{"userPackageId":1,"goodsInfoId":11,"num":1},{"userPackageId":1,"goodsInfoId":12,"num":1}]
      */
     @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "核销内容")

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

@@ -26,7 +26,7 @@ public interface UserPackageRepo extends JpaRepository<UserPackage, Long>, JpaSp
     @Transactional
     void updateUserId(Long oldUserId,Long newUserId);
 
-    @Query(value = "select goods_info.*, ifnull(user_package.num, 0) as num " +
+    @Query(value = "select goods_info.*, ifnull(user_package.num, 0) as num, user_package.id as userPackageId " +
             "from goods_info " +
             "left join user_package on goods_info.id = user_package.goods_info_id and user_package.user_id = ?1 " +
             "where goods_info.del = 0", nativeQuery = true)

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

@@ -1,6 +1,7 @@
 package com.izouma.jiashanxia.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -128,13 +129,17 @@ public class UserPackageFlowService {
         }
 
         // 用户已有套餐
+//        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserId(writeOffSaveVO.getUserId())
+//                .stream()
+//                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userPackage -> userPackage));
+
         Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserId(writeOffSaveVO.getUserId())
                 .stream()
                 .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userPackage -> userPackage));
 
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffSaveVO.getContent(), GoodsDTO.class);
         goodsDTOS.forEach(goodsDTO -> {
-            UserPackage userPackage = userPackageMap.get(goodsDTO.getGoodsInfoId());
+            UserPackage userPackage = userPackageMap.get(goodsDTO.getUserPackageId());
             if (ObjectUtil.isEmpty(userPackage)) {
                 throw new BusinessException("无此项目");
             }
@@ -145,6 +150,7 @@ public class UserPackageFlowService {
                 throw new BusinessException("核销数量大于套餐数量");
             }
             userPackage.setNum(userPackage.getNum() - goodsDTO.getNum());
+
             userPackageRepo.save(userPackage);
             goodsDTO.setNum(-goodsDTO.getNum());
         });

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

@@ -1,9 +1,7 @@
 package com.izouma.jiashanxia.web;
 
-import com.izouma.jiashanxia.domain.GoodsInfo;
 import com.izouma.jiashanxia.domain.UserPackage;
 import com.izouma.jiashanxia.dto.UserPackageDTO;
-import com.izouma.jiashanxia.repo.GoodsInfoRepo;
 import com.izouma.jiashanxia.service.UserPackageService;
 import com.izouma.jiashanxia.dto.PageQuery;
 import com.izouma.jiashanxia.exception.BusinessException;

src/main/vue/src/plugins/http.js

@@ -5,7 +5,8 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'https://jiashanxia.izouma.com/';
         // baseUrl = 'http://192.168.50.127:8080';
         break;
     case 'test':

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

@@ -32,4 +32,6 @@ public class UserPackageFlowRepoTest {
                 .content(str)
                 .build());
     }
+
+
 }

src/test/java/com/izouma/jiashanxia/repo/UserPackageRepoTest.java

@@ -0,0 +1,24 @@
+package com.izouma.jiashanxia.repo;
+
+import com.izouma.jiashanxia.dto.UserPackageDTO;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class UserPackageRepoTest {
+
+    @Autowired
+    private UserPackageRepo userPackageRepo;
+
+    @Test
+    public void test() {
+        List<UserPackageDTO> dtos = userPackageRepo.userPackage(125L);
+        dtos.forEach(System.out::println);
+    }
+}

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

@@ -21,16 +21,16 @@ public class UserPackageFlowServiceTest {
     @Test
     public void my() {
         // 810ms 3012ms
-        List<UserPackageFlowVO> my = userPackageFlowService.my(2L);
+        List<UserPackageFlowVO> my = userPackageFlowService.my(125L);
         my.forEach(System.out::println);
     }
 
     @Test
     public void test() {
         userPackageFlowService.writeOff(WriteOffSaveVO.builder()
-                .userId(40L)
+                .userId(125L)
                 .writeOffUserId(1L)
-                .content("[{\"goodsInfoId\":13,\"num\":1}]")
+                .content("[{\"goodsInfoId\":27,\"num\":1}]")
                 .build());
     }