fix: 增加单品改价信息
This commit is contained in:
@@ -68,6 +68,8 @@ public class OrderController {
|
|||||||
return Result.success(CodeEnum.SUCCESS, orderService.updatePrice(updatePriceDTO));
|
return Result.success(CodeEnum.SUCCESS, orderService.updatePrice(updatePriceDTO));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/queryCart")
|
@GetMapping("/queryCart")
|
||||||
public Result queryCart(@RequestHeader("token") String token,
|
public Result queryCart(@RequestHeader("token") String token,
|
||||||
@RequestHeader("loginName") String loginName,
|
@RequestHeader("loginName") String loginName,
|
||||||
|
|||||||
@@ -59,5 +59,9 @@ public class TbOrderDetail implements Serializable {
|
|||||||
private BigDecimal returnAmount;
|
private BigDecimal returnAmount;
|
||||||
private Integer isPrint;
|
private Integer isPrint;
|
||||||
|
|
||||||
|
private BigDecimal discountSaleAmount;
|
||||||
|
private String discountSaleNote;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.chaozhanggui.system.cashierservice.entity.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotBlank;
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class WaitCallDTO {
|
||||||
|
@NotNull
|
||||||
|
private Integer shopId;
|
||||||
|
@NotNull
|
||||||
|
private Integer isWaitCall;
|
||||||
|
private Integer orderId;
|
||||||
|
private String code;
|
||||||
|
@NotBlank
|
||||||
|
private String useType;
|
||||||
|
private String tableId;
|
||||||
|
}
|
||||||
@@ -934,6 +934,8 @@ public class OrderService {
|
|||||||
saleAmount = saleAmount.add(shopInfo.getTableFee());
|
saleAmount = saleAmount.add(shopInfo.getTableFee());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
orderDetail.setDiscountSaleNote(cashierCart.getDiscountSaleNote());
|
||||||
|
orderDetail.setDiscountSaleAmount(cashierCart.getDiscountSaleAmount());
|
||||||
orderDetail.setIsPrint(cashierCart.getIsPrint());
|
orderDetail.setIsPrint(cashierCart.getIsPrint());
|
||||||
orderDetail.setMemberPrice(cashierCart.getMemberPrice());
|
orderDetail.setMemberPrice(cashierCart.getMemberPrice());
|
||||||
orderDetail.setCreateTime(new Date());
|
orderDetail.setCreateTime(new Date());
|
||||||
|
|||||||
Reference in New Issue
Block a user