|
|
@@ -192,7 +192,9 @@ func BuyProductList(this *entmanageapplication.BuyProductListReq) *entmanageappl
|
|
|
if provinceCount := common.IntAllDef(v["province_count"], -1); provinceCount > 0 {
|
|
|
switch provinceCount {
|
|
|
case 1:
|
|
|
- productTypeSuffix = "单省版"
|
|
|
+ if !strings.Contains(product_type, "单省版") {
|
|
|
+ productTypeSuffix = "单省版"
|
|
|
+ }
|
|
|
default:
|
|
|
productTypeSuffix = "省份版"
|
|
|
}
|
|
|
@@ -430,8 +432,7 @@ func memberSetMap(userId, waitEmpowerId int64, orderData map[string]interface{})
|
|
|
payCycle := month(common.IntAll((*filterMap)["buy_cycle"]), common.IntAll((*filterMap)["buy_type"])) + month(common.IntAll((*filterMap)["give_cycle"]), common.IntAll((*filterMap)["give_type"]))
|
|
|
|
|
|
//payCycle := common.IntAll((*filterMap)["cycle"])
|
|
|
- serversId := common.ObjToString((*filterMap)["serviceIds"])
|
|
|
- log.Println("111111111", userId, serversId)
|
|
|
+ serversId := gconv.Strings((*filterMap)["serviceIds"])
|
|
|
startTime := common.ObjToString(orderData["service_starttime"])
|
|
|
endTime := common.ObjToString(orderData["service_endtime"])
|
|
|
tmp := "2006-01-02 15:04:05"
|
|
|
@@ -550,7 +551,7 @@ func memberSetMap(userId, waitEmpowerId int64, orderData map[string]interface{})
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- for _, s := range strings.Split(serversId, ",") {
|
|
|
+ for _, s := range serversId {
|
|
|
serverId, _ := strconv.Atoi(s)
|
|
|
mainId := serverId
|
|
|
if serverMap[serverId] != 0 {
|
