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