fix: 修复销售明细报表中字段存储数据问题 20210803175630

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

@@ -379,9 +379,9 @@ public class ParseToSaleDetail  extends BaseService{
                             String passengerId = passengerObj.getString("id");
 //                            if(passengerIds.indexOf(passengerId)>-1){
                             if(passengerIds.equals(passengerId)){
-                                pnr = passengerObj.getString("pnr");
+                                pnr = passengerObj.getString("pnr");  // 注意 此处需要乘机人数据中保存了 pnr
                                 ticketNumber = passengerObj.getString("ticketNumber");
-                                passengerNames += passengerObj.getString("passengerName")+",";
+                                passengerNames += passengerObj.getString("passengerName") +"-"+ ticketNumber +",";
 
                                 Integer passengerType = passengerObj.getInteger("passengerType");
                                 if(passengerType == 0){
@@ -427,7 +427,14 @@ public class ParseToSaleDetail  extends BaseService{
                         String transId = transObj.getString("id");
                         purchaseId_trans = transObj.getString("purchaseId");
                         orderId_trans = transObj.getString("orderId");
+                        String remark = transObj.getString("remark");
+                        if(!StringUtils.isBlank(remark) && remark.contains("accountAlias")) {
+                            JSONObject remarkJson = JSONObject.parseObject(remark);
+                            accountId = remarkJson.getString("accountAlias");
+                        } else {
                             accountId = transObj.getString("accountId");
+                        }
+
                         cardNumber = transObj.getString("cardNumber");
                         transactionNumber = transObj.getString("transactionNumber");
                         localPrice = transObj.getString("localPrice");
@@ -561,7 +568,8 @@ public class ParseToSaleDetail  extends BaseService{
         }finally{
 
         }
-        System.out.println(saleDetailList);
+        System.out.println(JSONObject.toJSONString(saleDetailList));
+        // logger.info("parseToSaleDetailMain |解析销售报表明细结果  saleDetailList.size="+ saleDetailList.size());
         return saleDetailList;
     }
 
@@ -572,7 +580,7 @@ public class ParseToSaleDetail  extends BaseService{
      * @return
      */
     public Object nullToString(Object obj, String toString){
-        return obj == null ? toString : obj;
+        return obj == null || obj.toString().isEmpty() ? toString : obj;
     }
 
     /**

src/main/resources/application-test.yml

@@ -6,7 +6,7 @@ spring:
     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/'
-    # 订单服务 ordercenter
+    # 订单服务 ordercenter 中销售明细报表统计接口
     #    statementApiUrl: 'http://121.36.16.56:32480/ordercenterApi/'
     statementApiUrl: 'http://121.36.31.103:32480/ordercenterApi/'
   pathConfig: