This commit is contained in:
2025-03-12 15:44:40 +08:00
parent 6122c8872e
commit 59ea0c5d5d
2 changed files with 1 additions and 4 deletions

View File

@@ -60,8 +60,6 @@ public class UserOrderController {
@Debounce(value = "#addDto.tableCode")
public CzgResult<OrderInfo> createOrder(@RequestBody OrderInfoAddDTO addDto) {
addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
long loginIdAsLong = StpKit.USER.getLoginIdAsLong();
log.info("获取到的用户Id为:{}", loginIdAsLong);
// addDto.setUserId(StpKit.USER.getLoginIdAsLong());
addDto.setShopId(StpKit.USER.getShopId());
addDto.setOrderType("miniapp");

View File

@@ -667,7 +667,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
private OrderInfo initOrderInfo(OrderInfoAddDTO param, ShopInfo shopInfo, ShopTable table) {
OrderInfo orderInfo = new OrderInfo();
if (param.getOrderId() != null) {
orderInfo.setUserId(param.getUserId());
orderInfo = getById(param.getOrderId());
if (!OrderStatusEnums.UNPAID.getCode().equals(orderInfo.getStatus())) {
throw new ValidateException("生成订单失败,订单已结束,请重新下单");
@@ -675,7 +674,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else {
orderInfo.setOrderNo(param.getPlatformType() + IdUtil.getSnowflakeNextId());
orderInfo.setShopId(param.getShopId());
orderInfo.setUserId(param.getUserId());
if (table != null) {
orderInfo.setTableCode(table.getTableCode());
orderInfo.setTableName(table.getName());
@@ -703,6 +701,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setSeatAmount(shopInfo.getTableFee().multiply(new BigDecimal(param.getSeatNum())));
orderInfo.setSeatNum(param.getSeatNum());
}
orderInfo.setUserId(param.getUserId());
orderInfo.setTableCode(param.getTableCode());
orderInfo.setPlaceNum(param.getPlaceNum());
orderInfo.setOriginAmount(param.getOriginAmount());