fix tj

Helius

2021-07-08 12ade37f986328c62d85255105cbb206f458f069

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

@@ -1,14 +1,17 @@
package com.xzx.gc.shop.controller;

import cn.hutool.core.util.ObjectUtil;
import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
import com.xzx.gc.common.dto.log.OperationAppLog;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.entity.JhyInfo;
import com.xzx.gc.entity.JhyOrder;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.shop.dto.QueryGoodsListDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
import com.xzx.gc.shop.service.JhyService;
import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
import com.xzx.gc.shop.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -19,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Map;

@RestController
@@ -28,6 +32,9 @@

    @Resource
    JhyService jhyService;

    @Resource
    JhyOrderMapper jhyOrderMapper;

    /**
     * 订单列表
@@ -41,5 +48,39 @@
        return JsonResult.success(result);
    }

    /**
     * 查看订单详情
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/jhy/viewJhyOrder.json")
    @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewJhyOrderVo.class)})
    @ApiOperation(value="集物员管理-查看订单详情", notes="test: 仅0有正确返回")
    public JsonResult<ViewJhyOrderVo> viewJhyOrder(@RequestBody ViewJhyOrderDto viewJhyOrderDto) {
        Long id = viewJhyOrderDto.getId();
        ViewJhyOrderVo viewJhyOrderVo = jhyService.viewJhyOrder(id);
        return JsonResult.success(viewJhyOrderVo);
    }

    /**
     * 取消订单
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/jhy/cancelJhyOrder.json")
    @ApiOperation(value="集物员订单管理-取消订单", notes="test: 仅0有正确返回")
    public JsonResult cancelJhyOrder(@RequestBody CancelJhyOrderDto model, HttpServletRequest request) {
        long id = model.getId();
        JhyOrder jhyOrder = jhyOrderMapper.selectByPrimaryKey(id);
        if(ObjectUtil.isEmpty(jhyOrder)){
            return JsonResult.failMessage("当前记录不存在！");
        }
        Integer status = jhyOrder.getStatus();
        if(JhyOrder.ORDER_STATUS_WAITING != status){
            return JsonResult.failMessage("订单不是待接单状态，不允许取消！");
        }
        jhyService.cancelJhyOrder(model);
        OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("集物员管理-取消订单-" + id).build();
        mqUtil.sendApp(build);
        return  JsonResult.success("操作成功！");
    }


}