|
@@ -116,18 +116,19 @@ public class PosOrderQsOprateController extends BaseController {
|
|
|
*/
|
|
*/
|
|
|
@Anonymous
|
|
@Anonymous
|
|
|
@Auth
|
|
@Auth
|
|
|
- @GetMapping("/deliverOrder")
|
|
|
|
|
|
|
+ @PostMapping("/deliverOrder")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public AjaxResult deliverOrder(@RequestHeader String token, @RequestParam Long id) {
|
|
|
|
|
|
|
+ public AjaxResult deliverOrder(@RequestHeader String token, @RequestBody PickupOrderInput input) {
|
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
JwtUtil jwtUtil = new JwtUtil();
|
|
|
PayPush push = new PayPush();
|
|
PayPush push = new PayPush();
|
|
|
String qsId = jwtUtil.getusid(token);
|
|
String qsId = jwtUtil.getusid(token);
|
|
|
- PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, id));
|
|
|
|
|
|
|
+ PosOrder order = posOrderService.getOne(new LambdaQueryWrapper<PosOrder>().eq(PosOrder::getId, input.getId()));
|
|
|
if (order == null) {
|
|
if (order == null) {
|
|
|
throw new ServiceException(MessageUtils.message("no.order.not.found"));
|
|
throw new ServiceException(MessageUtils.message("no.order.not.found"));
|
|
|
}
|
|
}
|
|
|
PosOrder posOrder = new PosOrder();
|
|
PosOrder posOrder = new PosOrder();
|
|
|
posOrder.setId(order.getId());
|
|
posOrder.setId(order.getId());
|
|
|
|
|
+ posOrder.setQsImg(input.getQsImg());
|
|
|
posOrder.setDeliveryStatus(3L);
|
|
posOrder.setDeliveryStatus(3L);
|
|
|
posOrder.setState(3L);
|
|
posOrder.setState(3L);
|
|
|
posOrder.setSdTime(new Date());
|
|
posOrder.setSdTime(new Date());
|