|
@@ -185,18 +185,20 @@ public class ExternalDockPolyApiHandler {
|
|
|
List<Map<String,Object>> orders = new ArrayList<>();
|
|
|
map.put("code","10000");
|
|
|
map.put("message","SUCCESS");
|
|
|
+ String orderId = "";
|
|
|
for(Order or : orderList){
|
|
|
List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderIdToPola(or.getSalesOrderid());
|
|
|
or.setOrderItemList(orderItemList);
|
|
|
try {
|
|
|
orders.add(getOrderMap(or));
|
|
|
+ orderId += or.getSalesOrderid() + ",";
|
|
|
}catch (Exception e){
|
|
|
logger.info("订单无法被转换为接口所需要的数据!");
|
|
|
}
|
|
|
}
|
|
|
map.put("orders",orders);
|
|
|
map.put("numtotalorder",orderNum);
|
|
|
- logger.info("------返回订单个数:" + orderList.size() + "---------");
|
|
|
+ logger.info("------订单下载,返回订单个数:" + orderList.size() + "--------- 订单id:" + orderId + "---------");
|
|
|
return map;
|
|
|
}
|
|
|
|
|
@@ -240,6 +242,7 @@ public class ExternalDockPolyApiHandler {
|
|
|
childrenrefund.put("refundStatusdescription",refundStatusdescription); //选填 退款说明
|
|
|
childrenrefundStatus.add(childrenrefund);
|
|
|
}
|
|
|
+ logger.info("------退款检测,查询订单id:" + order.getSalesOrderid() + "--订单状态:" + order.getSalesStatus() + "---------");
|
|
|
map.put("childrenrefundStatus",childrenrefundStatus); //子订单退款说明
|
|
|
map.put("code","10000");
|
|
|
map.put("message","返回订单退款状态成功,订单id:"+ order.getSalesOrderid() +"订单状态为:"+ this.getDescription(order.getSalesStatus()));
|
|
@@ -315,6 +318,7 @@ public class ExternalDockPolyApiHandler {
|
|
|
logger.info("失败原因:订单编号"+order.getSalesOrderid() + "快递公司:"+SendMessageUtil.hashmap.get(firm) +"快递单号"+num+"地址" +order.getSalesAddressInfo()+"openid:"+order.getSalesOpenid()+"remark:"+ResultInfo.ORDER_DETAIL+order.getSalesOrderid());
|
|
|
}
|
|
|
}
|
|
|
+ logger.info("---- 订单发货,发货订单id:" + order.getSalesOrderid() + "-- 订单状态:" + order.getSalesStatus() + "-----是否发货成功:"+ flag);
|
|
|
if(flag){
|
|
|
map.put("code","10000");
|
|
|
map.put("message","订单发货成功");
|