20210624 商品分类

xiaoyong931011

2021-06-24 17a77c4a058b549edd5032bb805bf45b00384362

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

@@ -1,5 +1,6 @@
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;
@@ -27,6 +28,7 @@

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

@RestController
@@ -86,11 +88,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 expressId = orderService.deliverGoods(model);
        if(expressId > 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("操作失败！");
        }
    }