20210625 商品分类

xiaoyong931011

2021-06-25 7108de563329444c690f96c373e67173be54cf32

20210625 商品分类

 gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java

@@ -79,7 +79,7 @@
        }
        Integer status = scoreOrder.getStatus();
        if(ScoreOrder.STATUS_READY != status){
            return JsonResult.failMessage("当前订单不是代发货状态！");
            return JsonResult.failMessage("当前订单不是待发货状态！");
        }
        String expressCom = model.getExpressCom();
        if(StrUtil.isEmpty(expressCom)){
@@ -130,6 +130,32 @@
        }
    }

    /**
     * 取消
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/cancelOrder.json")
    @ApiOperation(value="订单管理-取消", notes="test: 仅0有正确返回")
    public JsonResult cancelOrder(@RequestBody CancelOrderDto model, HttpServletRequest request) {
        long id = model.getId();
        ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
        if(ObjectUtil.isEmpty(scoreOrder)){
            return JsonResult.failMessage("订单不存在！");
        }
        Integer status = scoreOrder.getStatus();
        if(ScoreOrder.STATUS_READY != status){
            return JsonResult.failMessage("当前订单不是待发货状态！");
        }
        Long aLong = orderService.cancelOrder(model);
        if(aLong > 0){
            OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-取消-" + id).build();
            mqUtil.sendApp(build);
            return  JsonResult.success("操作成功！");
        }else{
            return  JsonResult.success("操作失败！");
        }
    }



}

 gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java

New file
@@ -0,0 +1,11 @@
package com.xzx.gc.shop.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
public class CancelOrderDto {

    @ApiModelProperty(value="订单ID")
    private Long id;
}

 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java

@@ -9,10 +9,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.entity.*;
import com.xzx.gc.shop.dto.AddGoodsOrderDto;
import com.xzx.gc.shop.dto.DeliverGoodsDto;
import com.xzx.gc.shop.dto.InsureOrderDto;
import com.xzx.gc.shop.dto.QueryOrderListDto;
import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.*;
import com.xzx.gc.shop.vo.ExpressInfoVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
@@ -156,4 +153,15 @@
        AddressInfo addressInfo = addressInfoMapper.selectByPrimaryKey(addGoodsOrderDto.getAddressId());
        AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId());
    }

    public Long cancelOrder(CancelOrderDto model) {
        /**
         * todo 只更新了订单状态，后续操作待增加
         */
        ScoreOrder scoreOrder = new ScoreOrder();
        scoreOrder.setId(model.getId());
        scoreOrder.setStatus(ScoreOrder.STATUS_CANCEL);
        scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
        return scoreOrder.getId();
    }
}