20210625 商品分类

xiaoyong931011

2021-06-25 9f947ed231edeb18fb16a03cbd437aa28be93631

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

@@ -1,20 +1,18 @@
package com.xzx.gc.shop.controller;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
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.ScoreGoods;
import com.xzx.gc.entity.ScoreOrder;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.mapper.ScoreOrderMapper;
import com.xzx.gc.shop.service.OrderService;
import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryOrderListVo;
import com.xzx.gc.shop.vo.ViewGoodsVo;
import com.xzx.gc.shop.vo.ViewOrderVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +25,7 @@

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

@RestController
@@ -59,6 +58,10 @@
    @ApiOperation(value="订单管理-查询订单详情", notes="test: 仅0有正确返回")
    public JsonResult<ViewOrderVo> viewOrder(@RequestBody ViewOrderDto viewOrderDto) {
        Long id = viewOrderDto.getId();
        ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
        if(ObjectUtil.isEmpty(scoreOrder)){
            return JsonResult.failMessage("订单不存在！");
        }
        ViewOrderVo viewOrderVo = orderService.viewOrder(id);
        return JsonResult.success(viewOrderVo);
    }
@@ -86,11 +89,45 @@
        if(StrUtil.isEmpty(expressNo)){
            return JsonResult.failMessage("快递单号不能为空！");
        }
        orderService.deliverGoods(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("操作成功！");
        Long aLong = orderService.deliverGoods(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("操作失败！");
        }
    }

    /**
     * 确认提货
     */
    @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/goods/insureOrder.json")
    @ApiOperation(value="订单管理-确认提货", notes="test: 仅0有正确返回")
    public JsonResult insureOrder(@RequestBody InsureOrderDto 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_DOING != status){
            return JsonResult.failMessage("当前订单不是已收货状态！");
        }
        List<String> voucherImgs = model.getVoucherImgs();
        if(CollUtil.isEmpty(voucherImgs)){
            return JsonResult.failMessage("凭证不能为空！");
        }
        Long orderId = orderService.insureOrder(model);
        if(orderId > 0){
            OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
                    .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("订单管理-确认提货-" + orderId).build();
            mqUtil.sendApp(build);
            return  JsonResult.success("操作成功！");
        }else{
            return  JsonResult.success("操作失败！");
        }
    }