Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

10 小时以前 eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1

 server/admin/src/main/java/com/doumee/api/business/OrdersController.java

@@ -12,10 +12,7 @@
import com.doumee.dao.dto.DispatchDTO;
import com.doumee.dao.dto.HandleOrderExceptionDTO;
import com.doumee.dao.dto.ManualRefundDTO;
import com.doumee.dao.vo.OrderDetailVO;
import com.doumee.dao.vo.OrderDispatchVO;
import com.doumee.dao.vo.OrdersExportVO;
import com.doumee.dao.vo.OrderSummaryVO;
import com.doumee.dao.vo.*;
import com.doumee.service.business.OrdersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -97,9 +94,10 @@
        for (Orders o : records) {
            OrdersExportVO vo = new OrdersExportVO();
            vo.setCode(o.getCode());
            vo.setRelationOrderCode(o.getRelationOrderCode());
            vo.setGoodsInfo(o.getGoodsInfo());
            vo.setTypeName(o.getType() != null ? (o.getType() == 0 ? "就地存取" : "异地存取") : "");
            vo.setOrderLevel(Constants.getDriverLevelName(Objects.nonNull(o.getOrderLevel())?Integer.valueOf(o.getOrderLevel()):Constants.ZERO));
            vo.setTypeName(o.getType() != null ? (o.getType() == 0 ? "就地寄存" : "同城寄送") : "");
            vo.setOrderLevel(StringUtils.isNotBlank(o.getOrderLevel()) ? Constants.getDriverLevelName(Integer.valueOf(o.getOrderLevel())) : Constants.getDriverLevelName(Constants.ZERO));
            vo.setDeclaredFee(String.valueOf(Constants.getFormatMoney(o.getDeclaredFee())));
            vo.setBasicAmount(String.valueOf(Constants.getFormatMoney(o.getBasicAmount())));
            vo.setTotalAmount(String.valueOf(Constants.getFormatMoney(o.getTotalAmount())));
@@ -109,6 +107,8 @@
            vo.setOverdueAmount(String.valueOf(Constants.getFormatMoney(o.getOverdueAmount())));
            vo.setExceptionAmount(String.valueOf(Constants.getFormatMoney(o.getExceptionAmount())));
            vo.setDeductionAmount(String.valueOf(Constants.getFormatMoney(o.getDeductionAmount())));
            vo.setExceptionFee(String.valueOf(Constants.getFormatMoney(o.getExceptionFee())));
            vo.setShopCompensationAmount(String.valueOf(Constants.getFormatMoney(o.getShopCompensationAmount())));
            vo.setStatusDesc(o.getStatusDesc());
            vo.setSettlementDesc(o.getSettlementStatus() != null ? (o.getSettlementStatus() == 1 ? "已结算" : "待结算") : "");
            vo.setPayTime(o.getPayTime());
@@ -174,4 +174,11 @@
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("手动退款详情")
    @GetMapping("/manualRefundDetail/{orderId}")
    @RequiresPermissions("business:orders:query")
    public ApiResponse<ManualRefundDetailVO> manualRefundDetail(@PathVariable Integer orderId) {
        return ApiResponse.success(ordersService.getManualRefundDetail(orderId));
    }

}