|
@@ -242,8 +242,7 @@ func setPaceMap(info map[string]interface{}) ([]map[string]interface{}, []string
|
|
|
if packages, ok := info["package"].(map[string]interface{}); ok && len(packages) > 0 {
|
|
|
for k, tmpackage := range packages { //遍历分包
|
|
|
if tmppack, ok := tmpackage.(map[string]interface{}); ok {
|
|
|
- //isNew, _ := tmppack["ck_isnew"].(bool)
|
|
|
- isNew := false
|
|
|
+ isNew, _ := tmppack["isnew"].(bool)
|
|
|
status := "-1"
|
|
|
if tmppack["package_son"] != nil {
|
|
|
status = "1"
|
|
@@ -332,19 +331,18 @@ func setPurchasingMap(info map[string]interface{}) ([]interface{}, []map[string]
|
|
|
purchasinglist, _ := util.BiaoZhu["purchasinglist"].([]interface{})
|
|
|
var purchasinglists []interface{}
|
|
|
//isNewPcl := []bool{} //记录子包是否是新增的
|
|
|
- isNewAndStatus := []map[string]interface{}{}
|
|
|
+ var isNewAndStatus []map[string]interface{}
|
|
|
if tmpcls, ok := info["purchasinglist"].([]interface{}); ok {
|
|
|
for _, v := range tmpcls {
|
|
|
if pcl, ok := v.(map[string]interface{}); ok {
|
|
|
- //isNew, _ := pcl["ck_isnew"].(bool)
|
|
|
- isNew := false
|
|
|
+ isNew, _ := pcl["isnew"].(bool)
|
|
|
status := "-1"
|
|
|
if pcl["purchasinglist_son"] != nil {
|
|
|
status = "1"
|
|
|
}
|
|
|
//isNewPcl = append(isNewPcl, isNew)
|
|
|
isNewAndStatus = append(isNewAndStatus, map[string]interface{}{"isnew": isNew, "status": status})
|
|
|
- pcls := []interface{}{}
|
|
|
+ var pcls []interface{}
|
|
|
for _, ps := range purchasinglist {
|
|
|
ps, _ := ps.(map[string]interface{})
|
|
|
value := pcl[qu.ObjToString(ps["key"])]
|
|
@@ -380,8 +378,7 @@ func setWorderMap(info map[string]interface{}) ([]interface{}, []map[string]inte
|
|
|
if tmpwds, ok := info["winnerorder"].([]interface{}); ok {
|
|
|
for _, v := range tmpwds {
|
|
|
if wd, ok := v.(map[string]interface{}); ok {
|
|
|
- //isNew, _ := wd["ck_isnew"].(bool)
|
|
|
- isNew := false
|
|
|
+ isNew, _ := wd["isnew"].(bool)
|
|
|
status := "-1"
|
|
|
if wd["winnerorder_son"] != nil {
|
|
|
status = "1"
|