|
|
@@ -53,8 +53,8 @@ import java.util.List;
|
|
|
import java.util.Objects;
|
|
|
|
|
|
@RestController
|
|
|
-//@RequestMapping("/p/myOrder")
|
|
|
-@RequestMapping("/myOrder")
|
|
|
+@RequestMapping("/p/myOrder")
|
|
|
+//@RequestMapping("/myOrder")
|
|
|
@Api(tags = "我的订单接口")
|
|
|
@AllArgsConstructor
|
|
|
public class MyOrderController {
|
|
|
@@ -376,8 +376,8 @@ public class MyOrderController {
|
|
|
@PutMapping("/receipt/{orderNumber}")
|
|
|
@ApiOperation(value = "根据订单号确认收货", notes = "根据订单号确认收货")
|
|
|
public ResponseEntity<String> receipt(@PathVariable("orderNumber") String orderNumber) {
|
|
|
- //String userId = SecurityUtils.getUser().getUserId();
|
|
|
- String userId = "36726893042d492aba446439c5f00584";
|
|
|
+ String userId = SecurityUtils.getUser().getUserId();
|
|
|
+// String userId = "36726893042d492aba446439c5f00584";
|
|
|
Order order = orderService.getOrderByOrderNumberAndUserId(orderNumber, userId, true);
|
|
|
if (Objects.equals(order.getDvyType(), 1)) {
|
|
|
CullenUtils.validateDataThrowException(Objects.equals(order.getHbOrderStatus(), 0), "订单未支付");
|
wangming