fix:续费修改

internal/logic/dayActivity/activity.go

@@ -18,6 +18,7 @@ const (
 )
 
 func ActivityNsqPublish(productType string, userId string, userPhone string, orderCode string, state int) {
+	log.Println("赠送抽奖次数", productType, userId, userPhone, orderCode, state)
 	// 判断订单上的用户id是职位id还是mgoid
 	var taskId, positionId int64
 	var mgoId, nickName string

internal/logic/order/detail.go

@@ -446,6 +446,9 @@ WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and jod.status =1 and d
 		gconv.Int(orderData.Map()["pay_money"]) > 0 && gconv.Int(orderData.Map()["return_status"]) == 0 {
 		returnMoney = gconv.Int(orderData.Map()["pay_money"])
 	}
+	if gconv.Int(orderMap["return_status"]) == 1 {
+		returnMoney = gconv.Int(orderMap["pay_money"])
+	}
 	result["returnRes"] = map[string]interface{}{
 		"returnMoney":    returnMoney,
 		"remainingMoney": gconv.Int(orderMap["pay_money"]) - returnMoney,

internal/logic/user/getService.go

@@ -453,7 +453,7 @@ WHERE %s and jod.product_type = '%s'  and jod.status =1 ORDER BY dor.create_time
 			"buySubject":       buySubject,                                  //个体
 			"empowerCount":     common.If(productType == "数据流量包", "1", "-"), //B.产品属性为“资源包”，则为“1”； C.产品属性非“会员服务”且非“资源包”，则展示-
 			"linkedId":         linkedId,                                    //关联id
-			"linkedOrder":      orderArr,                                    //关联订单
+			"orderArr":         orderArr,                                    //关联订单
 		}
 	}
 	return nil