Merge branch 'test6.9.10' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.10

@@ -104,11 +104,38 @@ public class SellerDepositOrderController {
                                       @RequestParam(name = "depotNum")int depotNum,
                                       @RequestParam(name = "addressId") String addressId){
 
-
+        sellerDepositOrderService.deliverToDepot();
         return new ApiResponse.ApiResponseBuilder()
                 .code(200)
-                .data(null)
                 .message("寄存订单发货录入成功")
                 .build();
     }
+
+    @RequestMapping(params = "method=ufo.depositOrder.skuList")
+    public ApiResponse skuList(@RequestParam(name = "uid")int uid,
+                                      @RequestParam(name = "orderCode")long orderCode){
+        SellerDepositOrderDetailReq req = SellerDepositOrderDetailReq.builder()
+                .uid(uid).orderCode(orderCode).build();
+        PageResp<SellerDepositOrderSkuListResp> resp = sellerDepositOrderService.getSkuList(req);
+        return new ApiResponse.ApiResponseBuilder()
+                .code(200)
+                .data(resp)
+                .message("寄存订单商品详情查询成功")
+                .build();
+    }
+
+
+    @RequestMapping(params = "method=ufo.depositOrder.cancel")
+    public ApiResponse cancel(@RequestParam(name = "uid")int uid,
+                               @RequestParam(name = "orderCode")long orderCode){
+        SellerDepositOrderDetailReq req = SellerDepositOrderDetailReq.builder()
+                .uid(uid).orderCode(orderCode).build();
+        logger.info("in ufo.depositOrder.cancel req {}", req);
+        sellerDepositOrderService.cancel(req);
+        return new ApiResponse.ApiResponseBuilder()
+                .code(200)
+                .message("寄存订单取消成功")
+                .build();
+    }
+
 }

@@ -242,15 +242,14 @@ public class AppraiseOrderService {
         Integer status = pao.getStatus();
 
         AppraiseOrderStatus aos = AppraiseOrderStatus.getByCode(status);
-
-
+        OrderAttributes oa = OrderAttributes.getOrderAttributes(pao.getAttributes());
 
         AppraiseOrderListResp resp = AppraiseOrderListResp.builder()
                 .uid(uid)
                 .orderCode(orderCode)
                 .goodsInfo(AppraiseOrderGoodsConvertor.do2Bo(paog))
-                .buttons(Objects.nonNull(aos) ? aos.listButtons() : null)
-                .statuStr(Objects.nonNull(aos) ? aos.statusStr() : "")
+                .buttons(Objects.nonNull(aos) ? aos.listButtons(oa) : null)
+                .statuStr(Objects.nonNull(aos) ? aos.statusStr(oa) : "")
                 .status(status)
                 .build();
         return resp;
@@ -282,8 +281,8 @@ public class AppraiseOrderService {
         //
         OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail
                 .builder().status(status)
-                .statuStr(aos.statusStr())
-                .detailDesc(aos.detailDesc()).build();
+                .statuStr(aos.statusStr(oa))
+                .detailDesc(aos.detailDesc(oa)).build();
         //
         String hidden_key = MetaKey.BUYER_DELIVERY_HIDDEN_ADDRESS;
         AppraiseOrderMeta aomc = new AppraiseOrderMeta();

@@ -29,4 +29,19 @@ public class SellerDepositOrderService {
     public SellerDepositOrderDetailResp getOrderDetail(SellerDepositOrderDetailReq req){
         return null;
     }
+
+
+    public PageResp<SellerDepositOrderSkuListResp> getSkuList(SellerDepositOrderDetailReq req){
+
+        return null;
+    }
+
+    public void deliverToDepot(){
+
+    }
+
+
+    public void cancel(SellerDepositOrderDetailReq req){
+
+    }
 }