订单列表修改

alien-entity/src/main/java/shop/alien/entity/store/vo/ReservationOrderListDto.java

@@ -36,4 +36,6 @@ public class ReservationOrderListDto {
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;
+    @ApiModelProperty(value = "核销码/券码")
+    private String verificationCode;
 }

alien-entity/src/main/resources/mapper/UserReservationOrderMapper.xml

@@ -12,6 +12,7 @@
         <result column="reservationId" property="reservationId"/>
         <result column="depositAmount" property="depositAmount"/>
         <result column="createdTime" property="createdTime"/>
+        <result column="verificationCode" property="verificationCode"/>
     </resultMap>
 
     <!-- 预订订单列表：店铺名称模糊搜索（限10字）、按状态筛选 -->
@@ -25,7 +26,8 @@
             o.order_status AS orderStatus,
             o.reservation_id AS reservationId,
             o.deposit_amount AS depositAmount,
-            o.created_time AS createdTime
+            o.created_time AS createdTime,
+            o.verification_code AS verificationCode
         FROM user_reservation_order o
         LEFT JOIN store_info s ON o.store_id = s.id AND s.delete_flag = 0
         LEFT JOIN store_img img ON img.store_id = s.id AND img.img_type = 1 AND img.delete_flag = 0

alien-store/src/main/java/shop/alien/store/service/impl/ReservationOrderListServiceImpl.java

@@ -133,6 +133,7 @@ public class ReservationOrderListServiceImpl implements ReservationOrderListServ
             UserReservation resForStatus = dto.getReservationId() != null ? reservationMap.get(dto.getReservationId()) : null;
             vo.setStatusText(buildStatusText(dto.getOrderStatus(), resForStatus));
             vo.setDepositAmount(dto.getDepositAmount());
+            vo.setVerificationCode(dto.getVerificationCode());
             vo.setCreatedTime(dto.getCreatedTime());
             vo.setCanContinuePay(false);
             vo.setCanCancelReservation(false);

alien-store/src/main/java/shop/alien/store/service/impl/UserReservationServiceImpl.java

@@ -190,7 +190,8 @@ public class UserReservationServiceImpl extends ServiceImpl<UserReservationMappe
 
         UserReservation entity = new UserReservation();
         BeanUtils.copyProperties(dto, entity, "tableIds", "reservationNo");
-        entity.setReservationNo(null);
+        entity.setId(existing.getId());
+        entity.setReservationNo(existing.getReservationNo());
         this.updateById(entity);
 
         saveReservationTables(existing.getId(), dto.getTableIds());

alien-store/src/main/java/shop/alien/store/vo/ReservationOrderListVo.java

@@ -53,6 +53,9 @@ public class ReservationOrderListVo {
     @ApiModelProperty(value = "预订金额（元），免费时为 null 或 0")
     private BigDecimal depositAmount;
 
+    @ApiModelProperty(value = "核销码/券码")
+    private String verificationCode;
+
     @ApiModelProperty(value = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createdTime;