修复交期问题

service/service_ly_common.go

@@ -318,8 +318,19 @@ func (ls *LyService) GetDelivery(supplierId int64, canal string) (delivery map[s
 	if canal != "" {
 		supplierRatio, _ := redis.String(redisCon.Do("HGET", "supp_ratio", canal))
 		if supplierRatio != "" {
-			delivery["cn_delivery"] = gjson.Get(supplierRatio, "cn_delivery_time").String()
-			delivery["hk_delivery"] = gjson.Get(supplierRatio, "us_delivery_time").String()
+			cnDeliveryTime := gjson.Get(supplierRatio, "cn_delivery_time").String()
+			usDeliveryTime := gjson.Get(supplierRatio, "us_delivery_time").String()
+			//为了兼容供应商修改的问题
+			if cnDeliveryTime != "周" && cnDeliveryTime != "天" {
+				delivery["cn_delivery"] = gjson.Get(supplierRatio, "cn_delivery_time").String()
+			}else{
+				delivery["cn_delivery"] = ""
+			}
+			if usDeliveryTime != "周" && usDeliveryTime != "天" {
+				delivery["hk_delivery"] = gjson.Get(supplierRatio, "us_delivery_time").String()
+			}else{
+				delivery["hk_delivery"] = ""
+			}
 		}
 		return
 	}