订单

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

@@ -94,6 +94,9 @@ public class OrderInfo extends BaseEntity {
     @ApiModelProperty(value = "购买手机")
     private String buyPhone;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 //    @ApiModelProperty(value = "区分是哪种订单")
 //    @Enumerated(EnumType.STRING)
 //    private GoodType goodType;

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

@@ -39,4 +39,7 @@ public class CreateOrder {
 
     @ApiModelProperty(value = "购买手机")
     private String buyPhone;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
 }

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -49,11 +50,20 @@ public class OrderInfoVO {
     @ApiModelProperty(value = "价钱")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "规格")
+    private String specification;
+
+    @ApiModelProperty(value = "日期")
+    private LocalDate day;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private User user;
 
     private Package aPackage;
 
     private LocalDateTime createdAt;
 
-    private List<PackageGoodsDTO> goods;
+//    private List<PackageGoodsDTO> goods;
 }

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

@@ -122,6 +122,7 @@ public class OrderInfoService {
                 .realName(createOrder.getRealName())
                 .buyPhone(createOrder.getBuyPhone())
                 .IDNo(createOrder.getIDNo())
+                .remark(createOrder.getRemark())
                 .build();
         if (ObjectUtil.isNotEmpty(createOrder.getStockId())) {
             // 保存规格
@@ -509,8 +510,8 @@ public class OrderInfoService {
             OrderInfoVO vo = new OrderInfoVO();
             BeanUtil.copyProperties(orderInfo, vo);
             vo.setAPackage(packageMap.get(orderInfo.getPackageId()));
-            List<PackageGoodsDTO> packageGoodsDTOS = packageGoodsRepo.packageGoods(orderInfo.getPackageId());
-            vo.setGoods(packageGoodsDTOS);
+//            List<PackageGoodsDTO> packageGoodsDTOS = packageGoodsRepo.packageGoods(orderInfo.getPackageId());
+//            vo.setGoods(packageGoodsDTOS);
             return vo;
         });
     }

src/main/vue/src/views/CouponList.vue

@@ -90,8 +90,8 @@ export default {
         };
     },
     created() {
-        if (this.$route.query.id) {
-            this.attractionsId = Number(this.$route.query.id);
+        if (this.$route.query.attraId) {
+            this.attractionsId = Number(this.$route.query.attraId);
         }
         this.$http
             .post('/attractions/all', { size: 1000, query: { del: false, brand: true } }, { body: 'json' })

src/main/vue/src/views/attractions/AttractionsList.vue

@@ -175,7 +175,7 @@ export default {
             this.$router.push({
                 path: '/writeOffUserList',
                 query: {
-                    id: id
+                    attraId: id
                 }
             });
         },
@@ -183,7 +183,7 @@ export default {
             this.$router.push({
                 path: '/packageList',
                 query: {
-                    id: id
+                    attraId: id
                 }
             });
         },
@@ -191,7 +191,7 @@ export default {
             this.$router.push({
                 path: '/orderInfoList2',
                 query: {
-                    id: id
+                    attraId: id
                 }
             });
         }

src/main/vue/src/views/attractions/BrandList.vue

@@ -45,9 +45,9 @@
                     <el-dropdown @command="handleCommand">
                         <el-button size="mini" plain style="margin-left:10px">更多</el-button>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item :command="`/couponList?id=${row.id}`">优惠券</el-dropdown-item>
-                            <el-dropdown-item :command="`/writeOffUserList?id=${row.id}`">核销员</el-dropdown-item>
-                            <el-dropdown-item :command="`/userCouponList?id=${row.id}`">核销列表</el-dropdown-item>
+                            <el-dropdown-item :command="`/couponList?attraId=${row.id}`">优惠券</el-dropdown-item>
+                            <el-dropdown-item :command="`/writeOffUserList?attraId=${row.id}`">核销员</el-dropdown-item>
+                            <el-dropdown-item :command="`/userCouponList?attraId=${row.id}`">核销列表</el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
                     <!-- <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button> -->
@@ -185,7 +185,7 @@ export default {
             this.$router.push({
                 path: '/couponList',
                 query: {
-                    id: id
+                    attraId: id
                 }
             });
         }

src/main/vue/src/views/attractions/OrderInfoList2.vue

@@ -179,8 +179,8 @@ export default {
             if (this.packageId) {
                 data.query.packageId = this.packageId;
             }
-            if (this.$route.query.id) {
-                this.attractionsId = Number(this.$route.query.id);
+            if (this.$route.query.attraId) {
+                this.attractionsId = Number(this.$route.query.attraId);
                 data.query.attractionsId = this.attractionsId;
             } else {
                 let attractionsId = this.userInfo.attractionsId;

src/main/vue/src/views/attractions/UserCouponList.vue

@@ -90,8 +90,8 @@ export default {
             if (this.search) {
                 data.search = this.search;
             }
-            if (this.$route.query.id) {
-                data.query.attractionsId = Number(this.$route.query.id);
+            if (this.$route.query.attraId) {
+                data.query.attractionsId = Number(this.$route.query.attraId);
             }
             if (!this.display) {
                 data.query.attractionsId = this.userInfo.attractionsId;

src/main/vue/src/views/attractions/WriteOffUserList.vue

@@ -154,8 +154,8 @@ export default {
         };
     },
     created() {
-        if (this.$route.query.id) {
-            this.attractionsId = Number(this.$route.query.id);
+        if (this.$route.query.attraId) {
+            this.attractionsId = Number(this.$route.query.attraId);
         }
         this.$http
             .post('/attractions/all', { size: 1000, query: { del: false } }, { body: 'json' })
@@ -207,7 +207,7 @@ export default {
             return {
                 search: this.search,
                 query: {
-                    attractionsId: this.attractionsId || Number(this.$route.query.id)
+                    attractionsId: this.attractionsId || Number(this.$route.query.attraId)
                 }
             };
             // }

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

@@ -40,7 +40,7 @@ public class OrderInfoServiceTest {
 
     @Test
     public void test() {
-        List<OrderInfoVO> contents = orderInfoService.my(Pageable.unpaged(), 68L, null).getContent();
+        List<OrderInfoVO> contents = orderInfoService.my(Pageable.unpaged(), 916L, null).getContent();
         contents.forEach(content -> System.out.println(content.getCreatedAt()));
     }