Merge branch 'dev4.5.8' of http://127.0.0.1:8080/qmx/jy into dev4.5.8

src/jfw/modules/app/src/web/templates/dataPack/index.html

@@ -90,7 +90,7 @@
                             <div class="l-left r-right">
                                 <p>{item.resourceType}</p>
                                 <p>{changeNum(item.number)}条</p>
-                                <p>{item.validYear}年</p>
+                                <p>{item.validYear == -1 ? '-' : item.validYear + '年'}</p>
                                 <p>{changeDate(item.endTime)}</p>
                                 <p>{changeDate(item.createTime)}</p>
                             </div>

src/jfw/modules/subscribepay/src/entity/dataExportPackApi.go

@@ -131,10 +131,12 @@ func perPackRecharge(userId string, pageNum, pageSize int) (int, []map[string]in
 			parsMap["createTime"] = createTime.Unix()
 		}
 
-		var orderDetail PackDetail
+		var orderDetail PackDetailReturn
 		if json.Unmarshal([]byte(qutil.ObjToString((*itemData)["remarks"])), &orderDetail) == nil {
 			parsMap["validYear"] = orderDetail.ValidYear
-			if createtimeParseErr == nil {
+			if orderDetail.EndTime > 0 { //通过账号合并合并过来的资源，没有有效期和价格
+				parsMap["endTime"] = orderDetail.EndTime
+			} else if createtimeParseErr == nil {
 				parsMap["endTime"] = createTime.AddDate(orderDetail.ValidYear, 0, 0).Unix()
 			}
 		}

src/jfw/modules/subscribepay/src/entity/dataExportPackStruct.go

@@ -26,8 +26,12 @@ var JyDataExportPack dataExportPackStruct
 type PackDetail struct {
 	PackType  int `json:"pType"`     //数据包类型 1标准，2高级
 	PackNum   int `json:"pNum"`      //数据包数量
-	ValidYear int `json:"validYear"` //有效年份
-	Price     int `json:"price"`     //数据包价格
+	ValidYear int `json:"validYear"` //有效年份 「账户合并过来的资源为-1」
+	Price     int `json:"price"`     //数据包价格 「账户合并过来的资源为-1」
+}
+type PackDetailReturn struct { //因账户合并，中台返回的字段会有差异
+	*PackDetail
+	EndTime int64 `json:"endTime"` //仅通过账户合并后的有此字段
 }
 
 var packPriceMap map[string]*PackDetail
@@ -285,7 +289,7 @@ func (this *dataExportPackStruct) GetDataExportRecordList(userId, memberPid stri
 		//导出时间
 		returnRow["export_timestamp"] = row["exportDate"]
 		//数据来源
-		if row["data_from"] == 1 {
+		if qutil.IntAll(row["data_from"]) == 1 {
 			returnRow["data_from"] = "统一订阅"
 		} else {
 			returnRow["data_from"] = "用户搜索"

src/web/templates/pc/dataPack/index.html

@@ -102,7 +102,7 @@
                                     </el-table-column>
                                     <el-table-column label="使用有效期" align="center">
                                         <template slot-scope="scope">
-                                            <span>{scope.row.validYear}年</span>
+                                            <span>{scope.row.validYear == -1 ? '--' : scope.row.validYear + '年'}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column label="到期时间" align="center">
@@ -143,7 +143,7 @@
                                     </div>
                                     <el-table-column prop="personal_name" label="用户姓名" align="center">
                                         <template slot-scope="scope">
-                                            <span>{scope.row.personal_name?scope.row.personal_name:'-'}</span>
+                                            <span>{scope.row.personal_name?scope.row.personal_name:'--'}</span>
                                         </template>
                                     </el-table-column>
                                     <el-table-column prop="export_timestamp" label="导出时间" align="center"></el-table-column>

src/web/templates/weixin/dataPack/index.html

@@ -101,7 +101,7 @@
                                 <div class="l-left r-right">
                                     <p>{item.resourceType}</p>
                                     <p>{changeNum(item.number)}条</p>
-                                    <p>{item.validYear}年</p>
+                                    <p>{item.validYear == -1 ? '-' : item.validYear + '年'}</p>
                                     <p>{changeDate(item.endTime)}</p>
                                     <p>{changeDate(item.createTime)}</p>
                                 </div>