|
@ -18,6 +18,7 @@ import org.jeecg.modules.product.entity.ProductReq; |
|
|
import org.jeecg.modules.product.entity.TbProduct; |
|
|
import org.jeecg.modules.product.entity.TbProduct; |
|
|
import org.jeecg.modules.product.service.ProductService; |
|
|
import org.jeecg.modules.product.service.ProductService; |
|
|
import org.jeecg.modules.productOrder.entity.TbProductOrder; |
|
|
import org.jeecg.modules.productOrder.entity.TbProductOrder; |
|
|
|
|
|
import org.jeecg.modules.productOrder.service.ITbProductOrderService; |
|
|
import org.jeecg.modules.tbCustoms.entity.TbCustoms; |
|
|
import org.jeecg.modules.tbCustoms.entity.TbCustoms; |
|
|
import org.jeecg.modules.tbCustoms.service.ITbCustomsService; |
|
|
import org.jeecg.modules.tbCustoms.service.ITbCustomsService; |
|
|
import org.jeecg.modules.utils.ValidateTool; |
|
|
import org.jeecg.modules.utils.ValidateTool; |
|
@ -48,6 +49,9 @@ public class ProductController extends JeecgController<TbProduct, ProductService |
|
|
|
|
|
|
|
|
@Resource |
|
|
@Resource |
|
|
private ITbCustomsService tbCustomsService; |
|
|
private ITbCustomsService tbCustomsService; |
|
|
|
|
|
@Resource |
|
|
|
|
|
private ITbProductOrderService tbProductOrderService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 分页列表查询 |
|
|
* 分页列表查询 |
|
|
* |
|
|
* |
|
@ -165,6 +169,22 @@ public class ProductController extends JeecgController<TbProduct, ProductService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "我的订单列表", notes = "我的订单列表") |
|
|
|
|
|
@GetMapping(value = "/myOrderlist") |
|
|
|
|
|
public Result<IPage<TbProductOrder>> myOrderlist( |
|
|
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
|
|
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
|
|
|
|
|
HttpServletRequest req, @RequestHeader("X-Access-Token") String token) { |
|
|
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); |
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<TbProductOrder> queryWrapper = QueryGenerator.initQueryWrapper(new TbProductOrder(), req.getParameterMap()); |
|
|
|
|
|
queryWrapper.eq("buy_user_id", hanHaiMember.getId()).orderByDesc("create_time"); |
|
|
|
|
|
Page<TbProductOrder> page = new Page<TbProductOrder>(pageNo, pageSize); |
|
|
|
|
|
IPage<TbProductOrder> pageList = tbProductOrderService.page(page, queryWrapper); |
|
|
|
|
|
return Result.OK(pageList); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value="确认/取消订单", notes="确认/取消订单") |
|
|
@ApiOperation(value="确认/取消订单", notes="确认/取消订单") |
|
|
@PostMapping(value = "/updateOrder") |
|
|
@PostMapping(value = "/updateOrder") |
|
|
public Result<String> updateOrder(@RequestBody UpdateOrderReq updateOrderReq, @RequestHeader("X-Access-Token") String token) { |
|
|
public Result<String> updateOrder(@RequestBody UpdateOrderReq updateOrderReq, @RequestHeader("X-Access-Token") String token) { |
|
|