|
@@ -11,6 +11,7 @@ import com.github.microservice.auth.security.helper.AuthHelper;
|
|
import com.github.microservice.auth.security.type.AuthType;
|
|
import com.github.microservice.auth.security.type.AuthType;
|
|
import com.zhongshu.payment.client.model.order.*;
|
|
import com.zhongshu.payment.client.model.order.*;
|
|
import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
|
|
import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
|
|
|
|
+import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
|
|
import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
|
|
import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
|
|
import com.zhongshu.payment.client.model.payment.CreateResponseModel;
|
|
import com.zhongshu.payment.client.model.payment.CreateResponseModel;
|
|
import com.zhongshu.payment.client.type.JobFlowMap;
|
|
import com.zhongshu.payment.client.type.JobFlowMap;
|
|
@@ -203,7 +204,7 @@ public class OrderController {
|
|
@ApiOperation("app_订单查询列表")
|
|
@ApiOperation("app_订单查询列表")
|
|
@RequestMapping(value = "user/search", method = RequestMethod.POST)
|
|
@RequestMapping(value = "user/search", method = RequestMethod.POST)
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
- public ResultContent<Page<OrderResultModel>> userSearch(@RequestBody UserSeachOrderModel userSeachOrderModel) {
|
|
|
|
|
|
+ public ResultContent<Page<OrderResult2Model>> userSearch(@RequestBody UserSeachOrderModel userSeachOrderModel) {
|
|
|
|
|
|
return orderServiceImp.userSearch(userSeachOrderModel);
|
|
return orderServiceImp.userSearch(userSeachOrderModel);
|
|
}
|
|
}
|