xiaoyong931011
2022-05-06 583fc7b7ed2ab5961c50e24e779262f168b9d55f
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java
@@ -112,7 +112,7 @@
    @ApiOperation(value = "取消订单", notes = "取消订单")
    @GetMapping(value = "/cancelOrder/{id}")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult cancelOrder(Long id) {
    public AjaxResult cancelOrder(@PathVariable Long id) {
        SysOrder order = orderService.findById(id);
        if (ObjectUtil.isEmpty(order)) {
@@ -187,7 +187,7 @@
    @ApiOperation(value = "获取用户的可用充值卡", notes = "获取用户的可用充值卡")
    @GetMapping(value = "getUseMoneyCard/{vipId}")
    public AjaxResult getUseMoneyCard(Long vipId) {
    public AjaxResult getUseMoneyCard(@PathVariable Long vipId) {
        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(vipId);
        moneyCardUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
@@ -221,7 +221,7 @@
        if(StrUtil.isNotEmpty(padShowListDto.getGoodType())){
            shoppingGoods.setGoodType(padShowListDto.getGoodType());
        }
        QueryUtil.setQueryLimit(shoppingGoods);
//        QueryUtil.setQueryLimit(shoppingGoods);
        if(StringUtils.isBlank(pageVo.getSort())){
            pageVo.setOrder("desc");
            pageVo.setSort("createTime");