Merge branch 'dev/v1.0.1_ws' of BaseService/entManageApplication into feature/v1.0.2

service/service.go

@@ -162,9 +162,18 @@ func BuyProductList(this *entmanageapplication.BuyProductListReq) *entmanageappl
 			if product_type == "VIP订阅" {
 				product_type = "超级订阅"
 			}
+			productTypeSuffix := ""
+			if provinceCount := common.IntAllDef(v["province_count"], -1); provinceCount > 0 {
+				switch provinceCount {
+				case 1:
+					productTypeSuffix = "单省版"
+				default:
+					productTypeSuffix = "省份版"
+				}
+			}
 			obj := &entmanageapplication.BuyProductList{
 				WaitEmpowerId: common.Int64All(v["id"]),
-				ProductType:   product_type,
+				ProductType:   fmt.Sprintf("%s%s", product_type, productTypeSuffix),
 				UseCount:      common.Int64All(v["use_count"]),
 				EmpowerCount:  common.Int64All(v["empower_count"]),
 				ProvinceCount: common.Int64All(v["province_count"]),
@@ -379,7 +388,8 @@ func memberSetMap(userId int64, orderData map[string]interface{}) (set map[strin
 	}
 	set = map[string]interface{}{
 		"o_member_jy": map[string]interface{}{
-			"i_wxpush": 1,
+			"i_wxpush":    1,
+			"i_areacount": common.IntAllDef((*filterMap)["areaCount"], -1),
 		},
 	}
 	setEntUser = map[string]interface{}{