1.代客下单 会员点单 取消点单
This commit is contained in:
@@ -180,18 +180,6 @@ public class TbPlaceController {
|
|||||||
return ResponseEntity.ok(tbShopTableService.pay(payDTO));
|
return ResponseEntity.ok(tbShopTableService.pay(payDTO));
|
||||||
}
|
}
|
||||||
@AnonymousAccess
|
@AnonymousAccess
|
||||||
|
|
||||||
@DeleteMapping("/order")
|
|
||||||
@Log("代客下单 删除订单")
|
|
||||||
@ApiOperation("代客下单 查询购物车 /shop/table")
|
|
||||||
public ResponseEntity<Object> delete(
|
|
||||||
@Validated @RequestBody DeleteOrderDTO deleteOrderDTO
|
|
||||||
) {
|
|
||||||
return ResponseEntity.ok(tbShopTableService.deleteOrder(deleteOrderDTO));
|
|
||||||
}
|
|
||||||
|
|
||||||
@AnonymousAccess
|
|
||||||
|
|
||||||
@PutMapping("/updateVip")
|
@PutMapping("/updateVip")
|
||||||
@Log("代客下单 查询购物车")
|
@Log("代客下单 查询购物车")
|
||||||
@ApiOperation("代客下单 查询购物车 /shop/table")
|
@ApiOperation("代客下单 查询购物车 /shop/table")
|
||||||
|
|||||||
@@ -758,8 +758,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
orderInfo.setFreightAmount(feeAmount);
|
orderInfo.setFreightAmount(feeAmount);
|
||||||
orderInfo.setProductAmount(saleAmount);
|
orderInfo.setProductAmount(saleAmount);
|
||||||
orderInfo.setTradeDay(DateUtils.getDay());
|
orderInfo.setTradeDay(DateUtils.getDay());
|
||||||
|
orderInfo.setUserId(String.valueOf(createOrderDTO.getVipUserId()));
|
||||||
orderInfoMapper.updateById(orderInfo);
|
orderInfoMapper.updateById(orderInfo);
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
String orderNo = generateOrderNumber();
|
String orderNo = generateOrderNumber();
|
||||||
orderInfo = new TbOrderInfo();
|
orderInfo = new TbOrderInfo();
|
||||||
@@ -779,6 +779,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
orderInfo.setTradeDay(day);
|
orderInfo.setTradeDay(day);
|
||||||
orderInfo.setMasterId(createOrderDTO.getMasterId());
|
orderInfo.setMasterId(createOrderDTO.getMasterId());
|
||||||
orderInfo.setRemark(createOrderDTO.getNote());
|
orderInfo.setRemark(createOrderDTO.getNote());
|
||||||
|
orderInfo.setUserId(String.valueOf(createOrderDTO.getVipUserId()));
|
||||||
orderInfoMapper.insert(orderInfo);
|
orderInfoMapper.insert(orderInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user