|
...
|
...
|
@@ -6,6 +6,7 @@ import com.yoho.order.model.ExpressCompany; |
|
|
|
import com.yoho.ufo.order.service.IBuyerOrderService;
|
|
|
|
import com.yoho.ufo.service.model.ApiResponse;
|
|
|
|
import com.yoho.ufo.service.model.PageResponseBO;
|
|
|
|
import com.yoho.ufo.util.DateUtil;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.BuyerOrderResp;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.ExpressInfoResp;
|
|
|
|
import com.yohobuy.ufo.model.order.resp.OrderDetailResp;
|
|
...
|
...
|
@@ -20,6 +21,8 @@ import org.springframework.web.bind.annotation.RestController; |
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import static java.util.stream.Collectors.toList;
|
|
|
|
|
|
|
|
@RestController
|
|
|
|
@RequestMapping(value = "/buyerOrder")
|
|
|
|
public class BuyerOrderController {
|
|
...
|
...
|
@@ -161,7 +164,14 @@ public class BuyerOrderController { |
|
|
|
public ApiResponse queryBuyerOrderFeedback(String orderCode) {
|
|
|
|
return new ApiResponse.ApiResponseBuilder()
|
|
|
|
.code(200)
|
|
|
|
.data(buyerOrderService.queryBuyerOrderFeedback(orderCode))
|
|
|
|
.data(buyerOrderService.queryBuyerOrderFeedback(orderCode).stream()
|
|
|
|
.map(feedback -> new JSONObject()
|
|
|
|
.fluentPut("id", feedback.getId())
|
|
|
|
.fluentPut("content", feedback.getContent())
|
|
|
|
.fluentPut("operatorUid", feedback.getOperatorUid())
|
|
|
|
.fluentPut("operatorName", feedback.getOperatorName())
|
|
|
|
.fluentPut("createTime", DateUtil.getDateFormatFromInt(feedback.getCreateTime(), "yyyy-MM-dd HH:mm:ss")))
|
|
|
|
.collect(toList()))
|
|
|
|
.build();
|
|
|
|
}
|
|
|
|
|
...
|
...
|
|
