fix:

1. 修改自动部署相关配置
2. 修复 转换销售明细 记录的方法

k8s.yaml

@@ -66,9 +66,9 @@ spec:
   type: NodePort
   ports:
     - name: http
-      targetPort: 8080
-      port: 8090
-      nodePort: 32780
+      targetPort: 8080    # application.yml port: 8080
+      port: 8999
+      nodePort: 32483
 ---
 apiVersion: apps/v1
 kind: Deployment

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

@@ -25,4 +25,7 @@ public class TestController {
         }
         return "";
     }
+
+
+
 }

src/main/java/com/yutu/base/service/ParseToSaleDetail.java

@@ -43,6 +43,8 @@ public class ParseToSaleDetail  extends BaseService{
         logger.info("[自动报表] 开始解析报表对象");
         List<SaleDetail> saleDetailList = new ArrayList<>();
 
+        System.out.println("map:"+ map);
+
         String orderDetail = map.get("other");
         String purchase = map.get("orderpurchase");
         String transactiondetail = map.get("transactiondetail");
@@ -71,8 +73,6 @@ public class ParseToSaleDetail  extends BaseService{
                 temp.setOfficalBalance(0.0);
                 temp.setOfficalRateAdjustDate(null);
 
-                //num值每次更新的时候，就给List<SaleDetail> 更新对象数量
-                saleDetailList.add(temp);
 
                 int mergeNum = 0;//合并行数
                 Double profit = 0.0;//利润
@@ -81,8 +81,12 @@ public class ParseToSaleDetail  extends BaseService{
 
                 Integer deleted = purchObj.getInteger("deleted");
                 if(deleted != 0){//已作废、非完整的  的采购信息跳过
+
                     continue;
                 }
+                //num值每次更新的时候，就给List<SaleDetail> 更新对象数量
+                saleDetailList.add(temp);
+
                 String purchaseId = purchObj.getString("purchaseId");//采购id
                 String saleOrderId = purchObj.getString("orderId");//销售id
                 if("".equals(saleOrderId) || saleOrderId==null) continue;
@@ -95,11 +99,13 @@ public class ParseToSaleDetail  extends BaseService{
                 String orderTripType = "";//订单行程类型
                 String routeType = convertTripTypeNum(route);//采购行程类型
                 String ticketType = convertTripTypeNum(route);//票号类型
-                String points = purchObj.getString("points");//使用积分
+//                String points = purchObj.getString("points") != null ? purchObj.getString("points") : "0";//使用积分
+                String points = nullToString(purchObj.getString("points"), "0").toString();//使用积分
                 String localCurrency = purchObj.getString("localCurrencyCode");//采购币种
                 String currency = purchObj.getString("currencyCode");//采购币种
-                String localTotalPrice = purchObj.getString("localTotalPrice");//外币金额
-                String purchaseTotalPrice = purchObj.getString("purchaseTotalPrice");//本币金额
+//                String localTotalPrice = purchObj.getString("localTotalPrice") != null ? purchObj.getString("localTotalPrice") : "0";//外币金额
+                String localTotalPrice = nullToString(purchObj.getString("localTotalPrice"), "0").toString();//外币金额
+                String purchaseTotalPrice = nullToString(purchObj.getString("purchaseTotalPrice"), "0").toString();//本币金额
                 String orderValuedAddedOrderNo = purchObj.getString("orderValuedAddedOrderNo");//增值服务单号
                 String purchaseChannel = purchObj.getString("purchaseChannel");//采购渠道
                 String purchaseAccount = purchObj.getString("purchaseAccount");//采购账户
@@ -124,7 +130,7 @@ public class ParseToSaleDetail  extends BaseService{
                 String rtPolicyCode = "";
                 List<String> policySourceArr = new ArrayList<String>();
 
-                saleDetailList.get(num).setPoints(Integer.parseInt(points));//14
+                saleDetailList.get(num).setPoints(Integer.parseInt(points));//14        // 注意 判空
                 saleDetailList.get(num).setPurchaseCurrency(localCurrency);//15
                 saleDetailList.get(num).setOrderValueAddedNo(orderValuedAddedOrderNo);//24
                 saleDetailList.get(num).setPurchaseChannel(purchaseChannel);//25
@@ -135,8 +141,8 @@ public class ParseToSaleDetail  extends BaseService{
                 saleDetailList.get(num).setPurchaseTime(purchObj.getString("purchaseTime"));//32
                 saleDetailList.get(num).setOrderValueAdded(orderType);//33
                 saleDetailList.get(num).setRemark(remarkText);//35
-                saleDetailList.get(num).setPurchasePrice_local(Double.parseDouble(localTotalPrice));//16
-                saleDetailList.get(num).setPurchasePrice_rmb(Double.parseDouble(purchaseTotalPrice));//17
+                saleDetailList.get(num).setPurchasePrice_local(Double.parseDouble(localTotalPrice));//16    // 注意 判空
+                saleDetailList.get(num).setPurchasePrice_rmb(Double.parseDouble(purchaseTotalPrice));//17   // 注意 判空
 
                 //反推销售单信息
                 count_saleOrder = 0;
@@ -156,11 +162,13 @@ public class ParseToSaleDetail  extends BaseService{
                 String status = "";
                 Double orderValuedPrice = 0.0;
 
+                // 遍历订单
                 for(int j=0;j<orderArr.size();j++){
                     JSONObject orderObj = orderArr.getJSONObject(j);
-                    String orderId = orderObj.getString("iD");
+                    String orderId = orderObj.getString("orderId");
 
-                    if(saleOrderId.indexOf(orderId)>-1){//匹配成功
+//                    if(saleOrderId.indexOf(orderId)>-1){//匹配成功
+                    if(saleOrderId.equals(orderId)){//匹配成功
                         ORDERID = orderId;
                         count_saleOrder++;
 
@@ -306,7 +314,8 @@ public class ParseToSaleDetail  extends BaseService{
                             }
                         }
                         //销售金额
-                        if(orderIdStr.indexOf(orderId)==-1){
+//                        if(orderIdStr.indexOf(orderId)==-1){
+                        if(!orderIdStr.equals(orderId)){
                             orderIdStr += orderId;
                         }else{
                             saleTotlalPrice = "0";
@@ -324,12 +333,16 @@ public class ParseToSaleDetail  extends BaseService{
                         flightLine = "";
                         flightTime = "";
                         flightNo = "";
-                        if(flightArr.size()==1)     orderTripType = "单程";
-                        if(flightArr.size()==2)     orderTripType = "往返";
-                        if(flightArr.size()==3)     orderTripType = "转机";
+                        if (flightArr.size() != 0){
+                            if(flightArr.size()==1)     orderTripType = "单程";
+                            if(flightArr.size()==2)     orderTripType = "往返";
+                            if(flightArr.size()==3)     orderTripType = "转机";
+                        } else {
+                            orderTripType = "无";
+                        }
                         for(int fli=0;fli<flightArr.size();fli++){
                             JSONObject flightObject = flightArr.getJSONObject(fli);
-                            String flightId = flightObject.getString("iD");
+                            String flightId = flightObject.getString("id");
                             if(flightSize==1){
                                 if(flightInfoIds.indexOf(flightId)>-1){
                                     flightLine = flightObject.getString("org")+"-"+flightObject.getString("dst");
@@ -363,8 +376,9 @@ public class ParseToSaleDetail  extends BaseService{
                         JSONArray passengerArr = orderObj.getJSONArray("orderpassenger");
                         for(int pass=0;pass<passengerArr.size();pass++){
                             JSONObject passengerObj = passengerArr.getJSONObject(pass);
-                            String passengerId = passengerObj.getString("iD");
-                            if(passengerIds.indexOf(passengerId)>-1){
+                            String passengerId = passengerObj.getString("id");
+//                            if(passengerIds.indexOf(passengerId)>-1){
+                            if(passengerIds.equals(passengerId)){
                                 pnr = passengerObj.getString("pnr");
                                 ticketNumber = passengerObj.getString("ticketNumber");
                                 passengerNames += passengerObj.getString("passengerName")+",";
@@ -547,8 +561,20 @@ public class ParseToSaleDetail  extends BaseService{
         }finally{
 
         }
+        System.out.println(saleDetailList);
         return saleDetailList;
     }
+
+    /**
+     * 判空，若为 Null 则替代为给定字符串 "0"
+     * @param obj
+     * @param toString
+     * @return
+     */
+    public Object nullToString(Object obj, String toString){
+        return obj == null ? toString : obj;
+    }
+
     /**
      * 将毫秒数转化为日期格式
      * @param timeMs  传入毫秒数

src/main/resources/application-prod.yml

@@ -12,7 +12,7 @@ spring:
     saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'  # 销售明细报表导出保存的本地路径
     saleReportExcelPath: 'D:/polestar_ExcelFile/'       #
 server:
-  port: 8066
+  port: 8080
   compression:
     enabled: true
     mime-types: application/json,application/xml,application/octet-stream,textml,text/xml,text/plain

src/main/resources/application-test.yml

@@ -12,7 +12,7 @@ spring:
     saleDetailReportExcelPath: 'D:\\polestar_ExcelFile/'  # 销售明细报表导出保存的本地路径
     saleReportExcelPath: 'D:/polestar_ExcelFile/'       #
 server:
-  port: 8066
+  port: 8080
   compression:
     enabled: true
     mime-types: application/json,application/xml,application/octet-stream,textml,text/xml,text/plain