* 新需求

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费金额（元）", index = 1)
+    @ExcelProperty(value = "金额（元）", index = 1)
     private String amount;
 
 
     private String activityName;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费下单时间", index = 4)
+    @ExcelProperty(value = "下单时间", index = 4)
     private String createDate;
 
 

src/main/java/com/huiju/estateagents/excel/redPacket/AccountPayRecordExport.java

 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "充值金额（元）", index = 1)
+    @ExcelProperty(value = "金额（元）", index = 1)
     private String amount;
 
 

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

     @RequestMapping(value = "/channel/taOrgOrder/getOrderDetailByTradeNo", method = RequestMethod.GET)
     public ResponseBean getOrderDetailByTradeNo(String tradeNo, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        try{
-            responseBean = iTaOrgOrderService.getOrderDetailByTradeNo(tradeNo,orgId);
-        }catch (Exception e){
+        try {
+            responseBean = iTaOrgOrderService.getOrderDetailByTradeNo(tradeNo, orgId);
+        } catch (Exception e) {
+            logger.error("getOrderDetailByTradeNo 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据tradeNo获取订单详情
+     *
+     * @param tradeNo
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/orgOrder/getOrderDetailByTradeNo", method = RequestMethod.GET)
+    public ResponseBean getOrderDetailByTradeNoForAdmin(String tradeNo, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaOrgOrderService.getOrderDetailByTradeNo(tradeNo, getOrgId(request));
+        } catch (Exception e) {
             logger.error("getOrderDetailByTradeNo 异常：", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
+
+
 }