fix:详情修改

internal/logic/dayActivity/activity.go

@@ -40,8 +40,8 @@ func ActivityNsqPublish(productType string, userId string, userPhone string, ord
 		positionId_, err := strconv.ParseInt(userId, 10, 64)
 		if err == nil && positionId_ > 0 {
 			positionId = positionId_
-			log.Println("抽奖order_code ==", orderCode, positionId)
-			positionData, _ := g.DB("base").GetOne(context.Background(), "SELECT id FROM base_position WHERE id = ?", userId)
+			positionData, err := g.DB("base").GetOne(context.Background(), "SELECT user_id FROM base_position WHERE id = ?", userId)
+			log.Println("抽奖order_code ==", orderCode, positionId, err)
 			if !positionData.IsEmpty() {
 				baseUserId := gconv.Int64(positionData.Map()["user_id"])
 				userRs, b := jyutil.MG.DB().FindOne("user", map[string]interface{}{

internal/logic/order/detail.go

@@ -235,7 +235,6 @@ INNER JOIN jy_product_class jpc on jpi.product_class_id = jpc.id WHERE jpi.code
 
 		if linkedDetailId := gconv.Int(m["linked_detail_id"]); linkedDetailId > 0 {
 			var orderArr []map[string]interface{}
-
 			//关联订单
 			if gconv.String(m["product_type"]) != "大会员" && gconv.String(m["product_type"]) != "VIP订阅" {
 				var whereSql string
@@ -331,7 +330,7 @@ WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and jod.status =1 and d
 					"name":             gconv.String(m["product_type"]), //产品名称
 					"serviceEndTime":   endTime,                         //服务结束时间
 					"serviceStartTime": startTime,                       //服务开始时间
-					"product_code":     gconv.String(linkedDetail.Map()["product_code"]),
+					"productCode":      gconv.String(linkedDetail.Map()["product_code"]),
 					"empowerCount":     paySubNum,  //服务授权数
 					"provinceCount":    areaCount,  //订阅省份
 					"buySubject":       buySubject, //个体

internal/logic/order/examine.go

@@ -137,7 +137,6 @@ func OrdersExamine(ctx context.Context, param model.OrdersExamine) error {
 			}
 		}
 		//0元订单审核通过后直接开通权益
-
 		if common.Float64All((orderData.Map())["pay_money"]) == 0 && consts.PhoneRegex.MatchString(common.ObjToString((orderData.Map())["user_phone"])) {
 			upData["order_status"] = 1
 			uData, entId, userPositionId, err := jyutil.GetCreateUserData(gconv.String(orderData.Map()["user_phone"]), gconv.String(orderData.Map()["company_name"]), gconv.Int(orderData.Map()["buy_subject"]) == 2)

internal/logic/user/getService.go

@@ -433,8 +433,8 @@ WHERE %s and jod.product_type = '%s'  and jod.status =1 ORDER BY dor.create_time
 			if gconv.String(m2["service_endtime"]) > time.Now().String() {
 				vipExist = true
 			}
-			if gconv.String(m2["service_starttime"]) > endTime {
-				endTime = gconv.String(m2["service_starttime"])
+			if gconv.String(m2["service_endtime"]) > endTime {
+				endTime = gconv.String(m2["service_endtime"])
 			}
 			if gconv.String(m2["service_starttime"]) < startTime {
 				startTime = gconv.String(m2["service_starttime"])