套餐商品

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

@@ -25,6 +25,10 @@ public class PackageGoods extends BaseEntity {
 
     private Long goodsInfoId;
 
+    private String name;
+
+    private String unit;
+
     @ApiModelProperty(value = "数量")
     private Integer num;
 
@@ -33,8 +37,8 @@ public class PackageGoods extends BaseEntity {
 
     private String remark;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "goodsInfoId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
-    @NotFound(action = NotFoundAction.IGNORE)
-    private GoodsInfo goodsInfo;
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    @JoinColumn(name = "goodsInfoId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
+//    @NotFound(action = NotFoundAction.IGNORE)
+//    private GoodsInfo goodsInfo;
 }

src/main/vue/src/components/PackageGoodsTable.vue

@@ -2,9 +2,9 @@
     <div>
         <el-table :data="setList" ref="table">
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
-            <el-table-column prop="goodsInfo.name" label="名称" min-width="120px"> </el-table-column>
+            <el-table-column prop="name" label="名称" min-width="120px"> </el-table-column>
             <el-table-column prop="num" label="数量"> </el-table-column>
-            <el-table-column prop="goodsInfo.unit" label="单位"> </el-table-column>
+            <el-table-column prop="unit" label="单位"> </el-table-column>
             <el-table-column prop="price" label="价格"> </el-table-column>
             <el-table-column prop="remark" label="备注" min-width="100px"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
@@ -187,6 +187,8 @@ export default {
                 if (valid) {
                     let data = { ...this.formData };
                     data.price = this.goods.price * data.num;
+                    data.name = this.goods.name;
+                    data.unit = this.goods.unit;
                     data.packageId = this.id;
                     this.saving = true;
                     this.$http

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

@@ -37,7 +37,7 @@ public class OrderInfoServiceTest {
 
     @Test
     public void test() {
-        List<OrderInfoVO> content = orderInfoService.my(Pageable.unpaged(), 68L, CollUtil.newArrayList(OrderInfoStatus.PAID,OrderInfoStatus.CANCELLED)).getContent();
+        List<OrderInfoVO> content = orderInfoService.my(Pageable.unpaged(), 125L, CollUtil.newArrayList(OrderInfoStatus.PAID,OrderInfoStatus.OFFLINE_PAID)).getContent();
         content.forEach(System.out::println);
     }
 }

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

@@ -36,5 +36,6 @@ public class UserServiceTest {
     @Test
     public void test2() {
         System.out.println(userService.overview(102L));
+//        System.out.println(1 * 0.01);
     }
 }