fix:

1. 对接销售明细报表业务

polestar-statement-services.iml

@@ -84,5 +84,11 @@
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
     <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
+    <orderEntry type="library" name="Maven: com.yutu.comm:yutu_common:1.0.37" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastJson:1.2.7" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" />
+    <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.2.2" level="project" />
   </component>
 </module>
\ No newline at end of file

pom.xml

@@ -127,6 +127,13 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.17</version>
         </dependency>
+
+        <!-- 使用 common 包中的 NoteResult -->
+        <dependency>
+            <groupId>com.yutu.comm</groupId>
+            <artifactId>yutu_common</artifactId>
+            <version>1.0.37</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/yutu/base/controller/DownLoadController.java

@@ -27,12 +27,28 @@ public class DownLoadController {
     @Autowired
     private PrivateFreightService privateFreightService;
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 获取销售数据
      * @param requestBody
      * @return
      */
-    @RequestMapping(value = "download/getSaleDetailData.do",method = RequestMethod.POST)
+    @RequestMapping(value = "download/getSaleDetailData",method = RequestMethod.POST)
     public Response getSaleDetail(@RequestBody String requestBody){
         return downLoadService.getSaleDetailReportData(requestBody);
     }
@@ -41,16 +57,17 @@ public class DownLoadController {
      * @param requestBody
      * @return
      */
-    @RequestMapping(value = "download/saleDetailReport.do",method = RequestMethod.POST)
+    @RequestMapping(value = "download/saleDetailReport",method = RequestMethod.POST)
     public Response saleDetailReport(@RequestBody String requestBody){
         return downLoadService.downLoadSaleDetailReport(requestBody);
     }
     /**
      * 下载销售报表(符合查询条件时，直接从数据库SaleDetail表中直接下载获取报表数据)
+     * 快速导出报表（新）
      * @param requestBody
      * @return
      */
-    @RequestMapping(value = "download/saleDetailReportFromAutoSource.do",method = RequestMethod.POST)
+    @RequestMapping(value = "download/saleDetailReportFromAutoSource",method = RequestMethod.POST)
     public Response saleDetailReportFromAutoSource(@RequestBody String requestBody){
         return downLoadService.downLoadSaleDetailFromAutoSource(requestBody);
     }
@@ -61,6 +78,7 @@ public class DownLoadController {
      */
     @RequestMapping(value = "parse/toSaleDetail",method = RequestMethod.POST)
     public Response parseToSaleDetail(@RequestBody String requestBody){
+        System.out.println("---------------");
         return downLoadService.parseToSaleDetail(requestBody);
     }
     /**
@@ -68,7 +86,7 @@ public class DownLoadController {
      * @param requestBody
      * @return
      */
-    @RequestMapping(value = "download/saleRules.do",method = RequestMethod.POST)
+    @RequestMapping(value = "download/saleRules",method = RequestMethod.POST)
     public Response downLoadSaleRules(@RequestBody String requestBody){
         logger.info("下载加价规则,参数:"+requestBody);
         return downLoadService.downLoadSaleRules(requestBody);
@@ -94,7 +112,7 @@ public class DownLoadController {
     /**
      * 按照指定条件导出私有运价底价配置
      */
-    @RequestMapping(value = "privateFreight/download.do",method = RequestMethod.POST)
+    @RequestMapping(value = "privateFreight/download",method = RequestMethod.POST)
     public Response exportPrivateFreight(@RequestBody String requestBody){
         return privateFreightService.exportPrivateFreight(requestBody);
     }

src/main/java/com/yutu/base/controller/StatementController.java

+package com.yutu.base.controller;
+
+
+import com.yutu.base.entity.Response;
+import com.yutu.base.service.SaleDetailService;
+import com.yutu.comm.entity.exception.NoteResult;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 报表管理：
+ *      销售明细报表
+ *      销售汇总报表
+ * 20210319111255
+ */
+@RestController
+@RequestMapping("statementApi/")
+public class StatementController {
+
+    private Logger logger = Logger.getLogger("download");
+    @Autowired
+    private SaleDetailService saleDetailService;
+
+    /**
+     * 销售明细报表页面 获取销售明细数据
+     * @param requestBody
+     * @return
+     */
+    @RequestMapping(value = "salesDetail/getSalesDetailList",method = RequestMethod.POST)
+    public NoteResult getSalesDetailList(@RequestBody String requestBody){
+        return saleDetailService.getSalesDetailList(requestBody);
+    }
+
+    /**
+     * 下载销售报表(符合查询条件时，直接从数据库SaleDetail表中直接下载获取报表数据)
+     * 销售明细报表 导出报表（新）
+     * @param requestBody
+     * @return
+     */
+    @RequestMapping(value = "salesDetail/downloadSalesDetailReport",method = RequestMethod.POST)
+    public NoteResult saleDetailReportFromAutoSource(@RequestBody String requestBody){
+        return saleDetailService.downloadSalesDetailReportExcel(requestBody);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

src/main/java/com/yutu/base/controller/UploadController.java

@@ -17,7 +17,7 @@ public class UploadController {
     @Autowired
     private UploadService uploadService;
 
-    @RequestMapping(value = "upload/saleRules.do",method = RequestMethod.POST)
+    @RequestMapping(value = "upload/saleRules",method = RequestMethod.POST)
     public Response uploadSaleRules(@RequestBody String requestBody){
         logger.info("上传销售规则,参数:"+requestBody);
         Response response =  uploadService.uploadSaleRules(requestBody);
@@ -25,7 +25,7 @@ public class UploadController {
         return response;
     }
 
-    @RequestMapping(value = "privateFreight/upload.do",method = RequestMethod.POST)
+    @RequestMapping(value = "privateFreight/upload",method = RequestMethod.POST)
     public Response uploadPrivateFreight(@RequestBody String requestBody){
         logger.info("上传私有运价底价配置,参数:"+requestBody);
         Response response =  uploadService.uploadPrivateFreight(requestBody);

src/main/java/com/yutu/base/entity/NoteResult.java

@@ -2,7 +2,7 @@ package com.yutu.base.entity;
 
 import java.io.Serializable;
 
-public class NoteResult implements Serializable {
+public class NoteResult<T> implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 状态码 0-成功  2-失败
@@ -19,13 +19,13 @@ public class NoteResult implements Serializable {
     /**
      * 设置要返回的具体数据
      */
-    private Object data;//返回的数据
+    private T data;//返回的数据
 
     public NoteResult() {
 
     }
 
-    public NoteResult(int status, String msg, Object data) {
+    public NoteResult(int status, String msg, T data) {
         this.status = status;
         this.msg = msg;
         this.data = data;
@@ -35,7 +35,7 @@ public class NoteResult implements Serializable {
         return data;
     }
 
-    public void setData(Object data) {
+    public void setData(T data) {
         this.data = data;
     }
 
@@ -63,6 +63,66 @@ public class NoteResult implements Serializable {
         this.info = info;
     }
 
+    /**
+     * 状态值 枚举
+     */
+    public static enum Status {
+        SUCCEED(200, "SUCCESS"),   // 成功的状态
+        FAILED(400, "FAILED"),    // 失败的状态
+        ERROR(300, "ERROR"),      // 出错的状态
+        NONE,    //
+        TICKET_DATE_ERROR,//航班日期错误
+        FLIGHT_INFO_ERROR,//航程信息错误
+        PASSENGER_INFO_ERROR,//乘客信息错误
+        SERVER_INTRRNAL_ERROR;//服务内部错误
+
+        private Integer status;
+        private String msg;
+
+        private Status() {
+        }
+
+        private Status(Integer status){
+            this.status = status;
+        }
+        private Status(Integer status, String msg) {
+            this.status = status;
+            this.msg = msg;
+        }
+
+        public Integer getStatus() {
+            return status;
+        }
+
+        public String getMsg(){
+            return msg;
+        }
+    }
+
+    public static NoteResult success(){
+        NoteResult noteResult = new NoteResult();
+        noteResult.setStatus(Status.SUCCEED.getStatus());
+        noteResult.setMsg(Status.SUCCEED.getMsg());
+        noteResult.setData(new Object());
+        return noteResult;
+    }
+
+    public static NoteResult success(Object data){
+        NoteResult noteResult = new NoteResult();
+        noteResult.setStatus(Status.SUCCEED.getStatus());
+        noteResult.setMsg(Status.SUCCEED.getMsg());
+        noteResult.setData(data);
+        return noteResult;
+    }
+
+    public static NoteResult error(String errorMessage){
+        NoteResult noteResult = new NoteResult();
+        noteResult.setStatus(Status.ERROR.getStatus());
+        noteResult.setMsg(errorMessage);
+        noteResult.setData(new Object());
+        return noteResult;
+    }
+
     @Override
     public String toString() {
         return "NoteResult [status=" + status + ", msg=" + msg + ", info="

src/main/java/com/yutu/base/entity/Response.java

@@ -52,15 +52,26 @@ public class Response implements Serializable{
     }
 
     public static enum Status {
-        SUCCEED,
-        FAILED,
-        NONE,
+        SUCCEED(200),   // 成功的状态
+        FAILED(400),    // 失败的状态
+        NONE,    //
         TICKET_DATE_ERROR,//航班日期错误
         FLIGHT_INFO_ERROR,//航程信息错误
         PASSENGER_INFO_ERROR,//乘客信息错误
         SERVER_INTRRNAL_ERROR;//服务内部错误
+
+        public Integer getStatus() {
+            return status;
+        }
+
+        private Integer status;
+
         private Status() {
         }
+
+        private Status(Integer status) {
+            this.status = status;
+        }
     }
 
     @Override

src/main/java/com/yutu/base/entity/SaleDetail.java

@@ -14,12 +14,12 @@ public class SaleDetail implements Serializable {
     private String id;
 
     private String key;//唯一标识  customerId_fromDate_toDate
-    private Date createTime;//创建时间
-    private Date updateTime;//更新时间
+    private String createTime;//创建时间
+    private String updateTime;//更新时间
     private Integer sortIndex;
 
-    private Date createOrderTime;                    //    sheet.addCell(new Label(0,0,"生单时间",wcf2));
-    private Date ticketTime;                    //    sheet.addCell(new Label(1,0,"出票时间",wcf2));
+    private String createOrderTime;                    //    sheet.addCell(new Label(0,0,"生单时间",wcf2));
+    private String ticketTime;                    //    sheet.addCell(new Label(1,0,"出票时间",wcf2));
     private String outerOrderNo;                    //    sheet.addCell(new Label(2,0,"订单号",wcf2));
     private String channel;                    //    sheet.addCell(new Label(3,0,"销售渠道",wcf2));
     private String store;                    //    sheet.addCell(new Label(4,0,"销售店铺",wcf2));
@@ -50,14 +50,14 @@ public class SaleDetail implements Serializable {
     private String policyCode;                    //    sheet.addCell(new Label(29,0,"政策编码",wcf2));
     private String orderStatus;                    //    sheet.addCell(new Label(30,0,"订单状态",wcf2));
     private String operator;                    //    sheet.addCell(new Label(31,0,"出票人",wcf2));
-    private Date purchaseTime;                    //    sheet.addCell(new Label(32,0,"采购时间",wcf2));
+    private String purchaseTime;                    //    sheet.addCell(new Label(32,0,"采购时间",wcf2));
     private String orderValueAdded;                   //    sheet.addCell(new Label(33,0,"附加产品",wcf2));
     private String orderValueAddedSpecific;                    //    sheet.addCell(new Label(34,0,"附加产品规格",wcf2));
     private String remark;                    //    sheet.addCell(new Label(35,0,"备注",wcf2));
     private String officalReceivedPaymentStatus;                    //    sheet.addCell(new Label(36,0,"财务-回款状态",wcf2));
     private Double officalActualExpendAmount;                    //    sheet.addCell(new Label(37,0,"财务-实际支出金额",wcf2));
     private Double officalBalance;                    //    sheet.addCell(new Label(38,0,"财务-补差",wcf2));
-    private Date officalRateAdjustDate;                    //    sheet.addCell(new Label(39,0,"财务-外币调整日期",wcf2));
+    private String officalRateAdjustDate;                    //    sheet.addCell(new Label(39,0,"财务-外币调整日期",wcf2));
 
     private String passengerNames;          //采购信息本次采购的乘客姓名
     private Integer adultCount;             //采购的成人数量
@@ -95,19 +95,19 @@ public class SaleDetail implements Serializable {
         this.key = key;
     }
 
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 
-    public Date getUpdateTime() {
+    public String getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime) {
+    public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
 
@@ -120,20 +120,20 @@ public class SaleDetail implements Serializable {
     }
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getCreateOrderTime() {
+    public String getCreateOrderTime() {
         return createOrderTime;
     }
 
-    public void setCreateOrderTime(Date createOrderTime) {
+    public void setCreateOrderTime(String createOrderTime) {
         this.createOrderTime = createOrderTime;
     }
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getTicketTime() {
+    public String getTicketTime() {
         return ticketTime;
     }
 
-    public void setTicketTime(Date ticketTime) {
+    public void setTicketTime(String ticketTime) {
         this.ticketTime = ticketTime;
     }
 
@@ -380,11 +380,11 @@ public class SaleDetail implements Serializable {
     }
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getPurchaseTime() {
+    public String getPurchaseTime() {
         return purchaseTime;
     }
 
-    public void setPurchaseTime(Date purchaseTime) {
+    public void setPurchaseTime(String purchaseTime) {
         this.purchaseTime = purchaseTime;
     }
 
@@ -436,11 +436,11 @@ public class SaleDetail implements Serializable {
         this.officalBalance = officalBalance;
     }
 
-    public Date getOfficalRateAdjustDate() {
+    public String getOfficalRateAdjustDate() {
         return officalRateAdjustDate;
     }
 
-    public void setOfficalRateAdjustDate(Date officalRateAdjustDate) {
+    public void setOfficalRateAdjustDate(String officalRateAdjustDate) {
         this.officalRateAdjustDate = officalRateAdjustDate;
     }
 
@@ -455,7 +455,7 @@ public class SaleDetail implements Serializable {
     public SaleDetail() {
     }
 
-    public SaleDetail(String id, String key, Date createTime, Date updateTime, Integer sortIndex, Date createOrderTime, Date ticketTime, String outerOrderNo, String channel, String store, String tairLine, String flightTime, String flightNumber, String tripType, String pnrType, String pnr, Integer passengerCount, Double salePrice, Double luggagePrice, Integer points, String purchaseCurrency, Double purchasePrice_local, Double purchasePrice_rmb, Double transactionDetail_local, Double transactionDetail_rmb, String payMethod, String cardNumber, Double profit, String transactionNumber, String orderValueAddedNo, String purchaseChannel, String purchaseAccount, String purchaseOrderNo, String policyType, String policyCode, String orderStatus, String operator, Date purchaseTime, String orderValueAdded, String orderValueAddedSpecific, String remark, String officalReceivedPaymentStatus, Double officalActualExpendAmount, Double officalBalance, Date officalRateAdjustDate, String passengerNames, Integer adultCount, Integer childCount) {
+    public SaleDetail(String id, String key, String createTime, String updateTime, Integer sortIndex, String createOrderTime, String ticketTime, String outerOrderNo, String channel, String store, String tairLine, String flightTime, String flightNumber, String tripType, String pnrType, String pnr, Integer passengerCount, Double salePrice, Double luggagePrice, Integer points, String purchaseCurrency, Double purchasePrice_local, Double purchasePrice_rmb, Double transactionDetail_local, Double transactionDetail_rmb, String payMethod, String cardNumber, Double profit, String transactionNumber, String orderValueAddedNo, String purchaseChannel, String purchaseAccount, String purchaseOrderNo, String policyType, String policyCode, String orderStatus, String operator, String purchaseTime, String orderValueAdded, String orderValueAddedSpecific, String remark, String officalReceivedPaymentStatus, Double officalActualExpendAmount, Double officalBalance, String officalRateAdjustDate, String passengerNames, Integer adultCount, Integer childCount) {
         this.id = id;
         this.key = key;
         this.createTime = createTime;

src/main/resources/application-prod.yml

@@ -6,8 +6,8 @@ spring:
     polestarLogsServicesUrl: 'http://127.0.0.1:8089/'
     dataApiUrl: 'http://127.0.0.1:38071/iffs-data-api/'
   pathConfig:
-    saleReportExcelPath: 'F:/overseasCheetah_ExcelFile/'
-    saleDetailReportExcelPath: 'F:\\overseasCheetah_ExcelFile/'
+    saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'
+    saleReportExcelPath: 'D:/polestar_ExcelFile/'
 server:
   port: 8066
   compression:

src/main/resources/application-temp.yml

@@ -6,8 +6,8 @@ spring:
     polestarLogsServicesUrl: 'http://192.168.0.88:8055/'
     dataApiUrl: 'http://14.18.207.103:38071/iffs-data-api/'
   pathConfig:
-    saleReportExcelPath: 'E:/overseasCheetah_ExcelFile/'
-    saleDetailReportExcelPath: 'E:\\overseasCheetah_ExcelFile/'
+    saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'
+    saleReportExcelPath: 'D:/polestar_ExcelFile/'
 server:
   port: 8333
   compression:

src/main/resources/application-test.yml

 spring:
   urlConfig:
     overseasCheetahUrl: 'http://127.0.0.1:18092/polestar/'
-    overseasAirTicketUrl: 'http://127.0.0.1:18071/OverseasAirTicket/'
+#    overseasAirTicketUrl: 'http://127.0.0.1:18071/OverseasAirTicket/'
+    overseasAirTicketUrl: 'http://192.168.11.158:8080/ordercenterApi/'
     productServiceUrl: 'http://127.0.0.1:28071/20160907_InterfaceConnected/'
     polestarLogsServicesUrl: 'http://127.0.0.1:8089/'
     dataApiUrl: 'http://14.18.207.91:38071/iffs-data-api/'
+
+    statementApiUrl: 'http://192.168.11.158:8080/ordercenterApi/'
   pathConfig:
-    saleDetailReportExcelPath: 'D:\\overseasCheetah_ExcelFile/'
-    saleReportExcelPath: 'D:/overseasCheetah_ExcelFile/'
+    saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'  # 销售明细报表导出保存的本地路径
+    saleReportExcelPath: 'D:/polestar_ExcelFile/'       #
 server:
   port: 8066
   compression:

报表服务备忘记录.txt

-报表服务备忘记录  polestar-statement-services
+报表服务备忘记录  polestar-statement-services
@@ -6,4 +6,73 @@
     [INFO]2020-12-09 11:36:50[uploadSaleRules][上传销售规则,参数:{"customerId":"2cb3aa90-7530-11e9-b14b-c81f66ba6a47","filePath":"D:\\\\webService\\\\overseasCheetah_ExcelFile/2cb3aa90-7530-11e9-b14b-c81f66ba6a47/SalesRulesUpLoad/20201209\\1607483667248workpolicy.xlsx","operator":"%E7%8E%8B%E7%A6%B9"}]
 2. 接口参数模板
     D:\pc\Project\polestar\polestar-statement-services\.idea\httpRequests\http-requests-log.http
-3.
+3. 下载销售明细报表数据 ，参数
+        [INFO]2021-03-16 17:17:29[getSaleDetailReportData][开始获取数据，参数：{
+            "customerId": "2cb3aa90-7530-11e9-b14b-c81f66ba6a47",
+            "endTime_Tic": "2021-03-08 00:00:00",
+            "orderStatus": "4",
+            "requestId": "",
+            "startTime_Tic": "2021-03-07 00:00:00",
+            "tableName": "orderinfo,orderpassenger,orderflightinfo,orderpurchase,orderinsurance,ordervalueadded,transactiondetail,transactiondetail_old"
+        }]
+
+
+
+
+{
+    "status": 0,
+    "msg": "查询成功",
+    "data": [
+        {
+            "id": "00027727-2e16-485a-b1b3-f13d5079645a",
+            "key": "df0286f1-eaac-11e7-adf4-a4badb3682ff_2018-10-25_2018-10-26",
+            "createTime": "2018-12-21 09:41:41",
+            "updateTime": "2018-12-21 09:41:41",
+            "createOrderTime": "2018-10-24 16:24:26",
+            "ticketTime": "2018-10-25 00:55:41",
+            "outerOrderNo": "1380889117689",
+            "channel": "Taobao",
+            "store": "tbml",
+            "tairLine": "HKT-DMK",
+            "flightTime": "1544358000000",
+            "flightNumber": "FD3028",
+            "tripType": "单程",
+            "pnrType": "去程",
+            "pnr": "BWSTUZ",
+            "passengerCount": 1,
+            "salePrice": 128.0,
+            "luggagePrice": 0.0,
+            "points": 0,
+            "purchaseCurrency": "CNY",
+            "purchasePrice_local": 92.0,
+            "purchasePrice_rmb": 92.0,
+            "transactionDetail_local": 92.0,
+            "transactionDetail_rmb": 92.0,
+            "payMethod": "支付宝huochepiao3",
+            "cardNumber": "支付宝huochepiao3",
+            "profit": 36.0,
+            "transactionNumber": " ",
+            "orderValueAddedNo": " ",
+            "purchaseChannel": "艺龙",
+            "purchaseAccount": "18513092060----huidarui",
+            "purchaseOrderNo": "IT7JP5181024MO515179",
+            "policyType": "普通促销",
+            "policyCode": "TGJ泰国-中国",
+            "orderStatus": "已出票",
+            "operator": "曹坤祥",
+            "purchaseTime": "2018-10-24 19:01:39",
+            "orderValueAdded": " ",
+            "orderValueAddedSpecific": " ",
+            "remark": " ",
+            "officalReceivedPaymentStatus": " ",
+            "officalActualExpendAmount": 0.0,
+            "officalBalance": 0.0,
+            "officalRateAdjustDate": null,
+            "passengerNames": null,
+            "adultCount": null,
+            "childCount": null,
+            "sortIndex": 438
+        }
+    ],
+    "info": null
+}
\ No newline at end of file