|
|
|
@ -1,41 +1,30 @@
|
|
|
|
package com.cyl.manager.oms.controller;
|
|
|
|
package com.cyl.manager.oms.controller;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.List;
|
|
|
|
import com.cyl.manager.oms.convert.OrderConvert;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.domain.Order;
|
|
|
|
import com.cyl.h5.config.SecurityUtil;
|
|
|
|
import com.cyl.manager.oms.pojo.query.OrderQuery;
|
|
|
|
import com.cyl.manager.oms.pojo.request.DeliverProductRequest;
|
|
|
|
import com.cyl.manager.oms.pojo.request.DeliverProductRequest;
|
|
|
|
import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest;
|
|
|
|
import com.cyl.manager.oms.pojo.request.ManagerOrderQueryRequest;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.ManagerOrderDetailVO;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.ManagerOrderVO;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.ManagerOrderVO;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
|
|
|
|
import com.cyl.manager.oms.pojo.vo.OrderOperateHistoryVO;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.service.OrderService;
|
|
|
|
|
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
|
|
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
|
import com.ruoyi.common.core.redis.RedisService;
|
|
|
|
import com.ruoyi.common.core.redis.RedisService;
|
|
|
|
|
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
import org.springframework.data.domain.PageImpl;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
import org.springframework.data.domain.Page;
|
|
|
|
|
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
import java.util.List;
|
|
|
|
import org.springframework.web.bind.annotation.PutMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.DeleteMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.PathVariable;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
|
|
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
|
|
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.convert.OrderConvert;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.domain.Order;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.pojo.query.OrderQuery;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.service.OrderService;
|
|
|
|
|
|
|
|
import com.cyl.manager.oms.pojo.vo.OrderVO;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 订单表Controller
|
|
|
|
* 订单表Controller
|
|
|
|
*
|
|
|
|
*
|
|
|
|
@ -139,4 +128,10 @@ public class OrderController extends BaseController {
|
|
|
|
return ResponseEntity.ok(service.log(orderId));
|
|
|
|
return ResponseEntity.ok(service.log(orderId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("订单解密")
|
|
|
|
|
|
|
|
@GetMapping("/decryptPhone/{orderId}")
|
|
|
|
|
|
|
|
public ResponseEntity<String> decryptPhone(@PathVariable Long orderId){
|
|
|
|
|
|
|
|
String decryptPhone = service.decryptPhone(orderId);
|
|
|
|
|
|
|
|
return ResponseEntity.ok(decryptPhone);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|