改名

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

@@ -50,7 +50,7 @@ public class OrderInfo extends BaseEntity {
     private String name;
 
     @ApiModelProperty(value = "充值套餐")
-    private Long setMealId;
+    private Long packageId;
 
     @ApiModelProperty(value = "价钱")
     private BigDecimal price;

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

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

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

@@ -15,5 +15,5 @@ public interface PackageGoodsRepo extends JpaRepository<PackageGoods, Long>, Jpa
     @Transactional
     void softDelete(Long id);
 
-    List<PackageGoods> findAllBySetMealId(Long setId);
+    List<PackageGoods> findAllByPackageId(Long setId);
 }

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

@@ -61,14 +61,14 @@ public class OrderInfoService {
     /*
     下订单
      */
-    public OrderInfo creatOrder(Long userId, Long setInfoId, PayMethod payMethod) {
-        Package setInfo = packageRepo.findById(setInfoId).orElseThrow(new BusinessException("无套餐"));
+    public OrderInfo creatOrder(Long userId, Long packageId, PayMethod payMethod) {
+        Package setInfo = packageRepo.findById(packageId).orElseThrow(new BusinessException("无套餐"));
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
         String localTime = df.format(LocalDateTime.now());
         String num = String.format("%05d", orderInfoRepo.orderNum() + 1);
 
         OrderInfo order = OrderInfo.builder()
-                .setMealId(setInfoId)
+                .packageId(packageId)
                 .status(OrderInfoStatus.UNPAID)
                 .userId(userId)
                 .payMethod(payMethod)
@@ -91,10 +91,10 @@ public class OrderInfoService {
         orderInfoRepo.save(order);
 
         // 套餐内商品
-        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(order.getSetMealId());
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllByPackageId(order.getPackageId());
         // 加入套餐商品
         Long userId = order.getUserId();
-        userPackageService.joinUserSet(userId, setGoodsList);
+        userPackageService.joinUserPackage(userId, setGoodsList);
 
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
         if (user.getParent() != null) {

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

@@ -52,7 +52,7 @@ public class PackageService {
         String localTime = df.format(LocalDateTime.now());
         String num = String.format("%05d", orderInfoRepo.orderNum() + 1);
         orderInfoRepo.save(OrderInfo.builder()
-                .setMealId(setMealId)
+                .packageId(setMealId)
                 .userId(userId)
                 .payMethod(PayMethod.OFFLINE)
                 .name(set.getName())
@@ -61,8 +61,8 @@ public class PackageService {
                 .build());
 
         // 加入套餐商品
-        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(setMealId);
-        userPackageService.joinUserSet(userId, setGoodsList);
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllByPackageId(setMealId);
+        userPackageService.joinUserPackage(userId, setGoodsList);
 
         // 新建公司
         Company company = companyRepo.findByUserId(userId);

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

@@ -100,17 +100,17 @@ public class UserPackageFlowService {
         }
 
         // 用户已有套餐
-        Map<Long, UserPackage> userSetMap = userPackageRepo.findAllByUserId(writeOffSaveVO.getUserId())
+        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserId(writeOffSaveVO.getUserId())
                 .stream()
-                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userSet -> userSet));
+                .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userPackage -> userPackage));
 
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(writeOffSaveVO.getContent(), GoodsDTO.class);
         goodsDTOS.forEach(goodsDTO -> {
-            UserPackage userSet = userSetMap.get(goodsDTO.getGoodsInfoId());
-            if (ObjectUtil.isEmpty(userSet)) {
+            UserPackage userPackage = userPackageMap.get(goodsDTO.getGoodsInfoId());
+            if (ObjectUtil.isEmpty(userPackage)) {
                 throw new BusinessException("无此项目");
             }
-            if (goodsDTO.getNum() > userSet.getNum()) {
+            if (goodsDTO.getNum() > userPackage.getNum()) {
                 throw new BusinessException("核销数量大于套餐数量");
             }
         });

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

@@ -39,15 +39,15 @@ public class UserPackageService {
 
     用户套餐和企业套餐重叠怎么办？
     */
-    public void joinUserSet(Long userId, List<PackageGoods> setGoodsList) {
+    public void joinUserPackage(Long userId, List<PackageGoods> packageGoodsList) {
         // 用户已有套餐
-        Map<Long, UserPackage> userSetMap = userPackageRepo.findAllByUserId(userId)
+        Map<Long, UserPackage> userPackageMap = userPackageRepo.findAllByUserId(userId)
                 .stream()
                 .collect(Collectors.toMap(UserPackage::getGoodsInfoId, userSet -> userSet));
 
         // 加入用户套餐
-        setGoodsList.forEach(setGoods -> {
-            UserPackage goods = userSetMap.get(setGoods.getGoodsInfoId());
+        packageGoodsList.forEach(setGoods -> {
+            UserPackage goods = userPackageMap.get(setGoods.getGoodsInfoId());
             if (ObjectUtil.isNotEmpty(goods)) {
                 goods.setNum(goods.getNum() + setGoods.getNum());
                 goods.setRemark(setGoods.getRemark());
@@ -69,7 +69,7 @@ public class UserPackageService {
             userRepo.save(user);
         }
         // 记录套餐流水
-        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(setGoodsList), GoodsDTO.class);
+        List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(packageGoodsList), GoodsDTO.class);
         userPackageFlowRepo.save(UserPackageFlow.builder()
                 .userId(userId)
                 .type(FlowType.BUY)

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

@@ -69,8 +69,8 @@ public class OrderInfoController extends BaseController {
 
     @PostMapping("/creat")
     @ApiOperation("创建订单")
-    public OrderInfo creat(@RequestParam Long setMealId, @RequestParam PayMethod payMethod) {
-        return orderInfoService.creatOrder(SecurityUtils.getAuthenticatedUser().getId(), setMealId, payMethod);
+    public OrderInfo creat(@RequestParam Long packageId, @RequestParam PayMethod payMethod) {
+        return orderInfoService.creatOrder(SecurityUtils.getAuthenticatedUser().getId(), packageId, payMethod);
     }
 
     @PostMapping("/cancel")

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

@@ -67,8 +67,8 @@ public class PackageController extends BaseController {
 
     @PostMapping("/openTeamSet")
     @ApiOperation("开通团队套餐")
-    public void openTeamSet(Long userId, Long setMealId) {
-        packageService.openTeamSet(userId, setMealId);
+    public void openTeamSet(Long userId, Long packageId) {
+        packageService.openTeamSet(userId, packageId);
     }
 
     @GetMapping("/allList")

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

@@ -60,8 +60,8 @@ public class PackageGoodsController extends BaseController {
 
     @PostMapping("/getSetGoods")
     @ApiOperation("获取套餐内商品信息")
-    public List<PackageGoods> getSetGoods(@RequestParam Long setId) {
-        return packageGoodsRepo.findAllBySetMealId(setId);
+    public List<PackageGoods> getSetGoods(@RequestParam Long packageId) {
+        return packageGoodsRepo.findAllByPackageId(packageId);
     }
 }
 

src/main/vue/src/components/SetInfoEdit.vue → src/main/vue/src/components/PackageEdit.vue

@@ -63,16 +63,19 @@
 </template>
 <script>
 export default {
-    name: 'SetInfoEdit',
+    name: 'PackageEdit',
     created() {
         if (this.$route.query.id) {
             this.$http
-                .get('/package/get/' + this.$route.query.id)
+                .get('package/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
                     if (res.tag !== '') {
                         this.dynamicTags = res.tag.split(',');
                     }
+                    if (res.img !== '') {
+                        this.formData.img = res.img.split(',');
+                    }
                 })
                 .catch(e => {
                     console.log(e);
@@ -83,7 +86,9 @@ export default {
     data() {
         return {
             saving: false,
-            formData: {},
+            formData: {
+                img: []
+            },
             rules: {
                 name: [
                     {
@@ -129,6 +134,7 @@ export default {
         submit() {
             let data = { ...this.formData };
             data.tag = this.dynamicTags.join(',');
+            data.img = this.formData.img.join(',');
             this.saving = true;
             this.$http
                 .post('/package/save', data, { body: 'json' })

src/main/vue/src/components/SetGoodsTable.vue → src/main/vue/src/components/PackageGoodsTable.vue

@@ -44,7 +44,7 @@
 </template>
 <script>
 export default {
-    name: 'SetGoodsTable',
+    name: 'PackageGoodsTable',
     data() {
         return {
             multipleMode: false,
@@ -188,11 +188,11 @@ export default {
                     let data = { ...this.formData };
                     data.unit = this.goods.unit;
                     data.price = this.goods.price * data.num;
-                    data.setMealId = this.id;
+                    data.packageId = this.id;
                     data.name = this.goods.name;
                     this.saving = true;
                     this.$http
-                        .post('/setGoods/save', data, { body: 'json' })
+                        .post('/packageGoods/save', data, { body: 'json' })
                         .then(res => {
                             this.saving = false;
                             this.$message.success('成功');

src/main/vue/src/views/OrderInfoList.vue

@@ -100,8 +100,8 @@ export default {
                 { label: '已取消', value: 'CANCELLED' }
             ],
             status: [],
-            setMealId: '',
-            setMeals: []
+            packageId: '',
+            packages: []
         };
     },
     computed: {
@@ -111,9 +111,9 @@ export default {
     },
     mounted() {
         this.$http
-            .get('/setMeal/allList')
+            .get('/package/allList')
             .then(res => {
-                this.setMeals = res;
+                this.packages = res;
             })
             .catch(e => {
                 console.log(e);
@@ -140,7 +140,7 @@ export default {
                 search: this.search,
                 query: {
                     status: this.status,
-                    setMealId: this.setMealId
+                    packageId: this.packageId
                 }
             };
         },

src/main/vue/src/views/PackageGoodsEdit.vue

@@ -43,11 +43,11 @@
 </template>
 <script>
 export default {
-    name: 'SetGoodsEdit',
+    name: 'PackageGoodsEdit',
     created() {
         if (this.$route.query.id) {
             this.$http
-                .get('setGoods/get/' + this.$route.query.id)
+                .get('packageGoods/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
                 })
@@ -113,7 +113,7 @@ export default {
 
             this.saving = true;
             this.$http
-                .post('/setGoods/save', data, { body: 'json' })
+                .post('/packageGoods/save', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
@@ -128,7 +128,7 @@ export default {
         onDelete() {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/setGoods/del/${this.formData.id}`);
+                    return this.$http.post(`/packageGoods/del/${this.formData.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/PackageGoodsList.vue

@@ -74,13 +74,13 @@ import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-    name: 'SetGoodsList',
+    name: 'PackageGoodsList',
     mixins: [pageableTable],
     data() {
         return {
             multipleMode: false,
             search: '',
-            url: '/setGoods/all',
+            url: '/packageGoods/all',
             downloading: false
         };
     },
@@ -101,7 +101,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/setGoodsEdit',
+                path: '/packageGoodsEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -109,7 +109,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/setGoodsEdit',
+                path: '/packageGoodsEdit',
                 query: {
                     id: row.id
                 }
@@ -118,7 +118,7 @@ export default {
         download() {
             this.downloading = true;
             this.$axios
-                .get('/setGoods/excel', {
+                .get('/packageGoods/excel', {
                     responseType: 'blob',
                     params: { size: 10000 }
                 })
@@ -151,7 +151,7 @@ export default {
         deleteRow(row) {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/setGoods/del/${row.id}`);
+                    return this.$http.post(`/packageGoods/del/${row.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/UserEdit.vue

@@ -116,9 +116,9 @@ export default {
                 console.log(e);
             });
         this.$http
-            .get('/setMeal/team')
+            .get('/package/team')
             .then(res => {
-                this.setMeals = res;
+                this.packages = res;
             })
             .catch(e => {
                 console.log(e);
@@ -152,12 +152,12 @@ export default {
                     }
                 ],
                 authorities: [{ required: true, message: '请选择角色', trigger: 'blur' }],
-                setMealId: [{ required: true, message: '请选择套餐', trigger: 'blur' }]
+                packageId: [{ required: true, message: '请选择套餐', trigger: 'blur' }]
             },
             authorities: [],
             companies: [],
-            setMeals: [],
-            setMealId: '',
+            packages: [],
+            packageId: '',
             showDialog: false,
             userDialog: false,
             employee: []
@@ -233,9 +233,9 @@ export default {
             this.showDialog = true;
             this.$alert('确认要创建么？', '提醒', { type: 'error' })
                 .then(() => {
-                    return this.$http.post('/setMeal/openTeamSet', {
+                    return this.$http.post('/package/openTeamSet', {
                         userId: this.formData.id,
-                        setMealId: this.setMealId
+                        packageId: this.packageId
                     });
                 })
                 .then(() => {

src/main/vue/src/views/UserPackageEdit.vue

@@ -31,11 +31,11 @@
 </template>
 <script>
 export default {
-    name: 'UserSetEdit',
+    name: 'UserPackageEdit',
     created() {
         if (this.$route.query.id) {
             this.$http
-                .get('userSet/get/' + this.$route.query.id)
+                .get('userPackage/get/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
                 })
@@ -67,7 +67,7 @@ export default {
 
             this.saving = true;
             this.$http
-                .post('/userSet/save', data, { body: 'json' })
+                .post('/userPackage/save', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
@@ -82,7 +82,7 @@ export default {
         onDelete() {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/userSet/del/${this.formData.id}`);
+                    return this.$http.post(`/userPackage/del/${this.formData.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/UserPackageFlowEdit.vue

@@ -45,11 +45,11 @@
 </template>
 <script>
 export default {
-    name: 'UserSetFlowEdit',
+    name: 'UserPackageFlowEdit',
     created() {
         if (this.$route.query.id) {
             this.$http
-                .get('userSetFlow/getDTO/' + this.$route.query.id)
+                .get('userPackageFlow/getDTO/' + this.$route.query.id)
                 .then(res => {
                     this.formData = res;
                 })
@@ -87,7 +87,7 @@ export default {
 
             this.saving = true;
             this.$http
-                .post('/userSetFlow/save', data, { body: 'json' })
+                .post('/userPackageFlow/save', data, { body: 'json' })
                 .then(res => {
                     this.saving = false;
                     this.$message.success('成功');
@@ -102,7 +102,7 @@ export default {
         onDelete() {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/userSetFlow/del/${this.formData.id}`);
+                    return this.$http.post(`/userPackageFlow/del/${this.formData.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/UserPackageFlowList.vue

@@ -63,13 +63,13 @@ import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-    name: 'UserSetFlowList',
+    name: 'UserPackageFlowList',
     mixins: [pageableTable],
     data() {
         return {
             multipleMode: false,
             search: '',
-            url: '/userSetFlow/writeOffAll',
+            url: '/userPackageFlow/writeOffAll',
             downloading: false,
             typeOptions: [
                 { label: '购买', value: 'BUY' },
@@ -101,7 +101,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/userSetFlowEdit',
+                path: '/userPackageFlowEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -109,7 +109,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/userSetFlowEdit',
+                path: '/userPackageFlowEdit',
                 query: {
                     id: row.id
                 }
@@ -118,7 +118,7 @@ export default {
         download() {
             this.downloading = true;
             this.$axios
-                .get('/userSetFlow/excel', {
+                .get('/userPackageFlow/excel', {
                     responseType: 'blob',
                     params: { size: 10000 }
                 })
@@ -151,7 +151,7 @@ export default {
         deleteRow(row) {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/userSetFlow/del/${row.id}`);
+                    return this.$http.post(`/userPackageFlow/del/${row.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

src/main/vue/src/views/UserPackageList.vue

@@ -64,13 +64,13 @@ import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
 
 export default {
-    name: 'UserSetList',
+    name: 'UserPackageList',
     mixins: [pageableTable],
     data() {
         return {
             multipleMode: false,
             search: '',
-            url: '/userSet/all',
+            url: '/userPackage/all',
             downloading: false
         };
     },
@@ -91,7 +91,7 @@ export default {
         },
         addRow() {
             this.$router.push({
-                path: '/userSetEdit',
+                path: '/userPackageEdit',
                 query: {
                     ...this.$route.query
                 }
@@ -99,7 +99,7 @@ export default {
         },
         editRow(row) {
             this.$router.push({
-                path: '/userSetEdit',
+                path: '/userPackageEdit',
                 query: {
                     id: row.id
                 }
@@ -108,7 +108,7 @@ export default {
         download() {
             this.downloading = true;
             this.$axios
-                .get('/userSet/excel', {
+                .get('/userPackage/excel', {
                     responseType: 'blob',
                     params: { size: 10000 }
                 })
@@ -141,7 +141,7 @@ export default {
         deleteRow(row) {
             this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
                 .then(() => {
-                    return this.$http.post(`/userSet/del/${row.id}`);
+                    return this.$http.post(`/userPackage/del/${row.id}`);
                 })
                 .then(() => {
                     this.$message.success('删除成功');

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

@@ -23,7 +23,7 @@ public class UserPackageFlowRepoTest {
 
     @Test
     public void test() {
-        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllBySetMealId(17L);
+        List<PackageGoods> setGoodsList = packageGoodsRepo.findAllByPackageId(17L);
         List<GoodsDTO> goodsDTOS = JSONObject.parseArray(JSONObject.toJSONString(setGoodsList), GoodsDTO.class);
         String str = JSONObject.toJSONString(goodsDTOS);
         userPackageFlowRepo.save(UserPackageFlow.builder()