|
@@ -158,11 +158,16 @@ public class OrderServiceImp implements OrderService {
|
|
return orderService2.userSearch(userSeachOrder2Model, pageable);
|
|
return orderService2.userSearch(userSeachOrder2Model, pageable);
|
|
}
|
|
}
|
|
|
|
|
|
- public ResultContent userDetails(String id) {
|
|
|
|
|
|
+ public ResultContent goodsDetail(String id) {
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
|
|
|
|
return orderService2.goodsDetail(userId, id);
|
|
return orderService2.goodsDetail(userId, id);
|
|
}
|
|
}
|
|
|
|
+ public ResultContent orderDetails(String orderNo) {
|
|
|
|
+ String userId = authHelper.getCurrentUser().getUserId();
|
|
|
|
+
|
|
|
|
+ return orderService2.orderDetail(userId, orderNo);
|
|
|
|
+ }
|
|
|
|
|
|
public ResultContent<Page<OrderResult2Model>> shopSearch(AdminSeachOrderModel adminSeachOrderModel, Pageable pageable) {
|
|
public ResultContent<Page<OrderResult2Model>> shopSearch(AdminSeachOrderModel adminSeachOrderModel, Pageable pageable) {
|
|
adminSeachOrderModel.setShopId(authHelper.getEnterPriseId());
|
|
adminSeachOrderModel.setShopId(authHelper.getEnterPriseId());
|