|
|
@@ -114,11 +114,11 @@ func FormatTag(data map[string]interface{}, count int) {
|
|
|
//订单购买的服务
|
|
|
//orderData := TiDb.Find("dwd_f_userbase_order_info", map[string]interface{}{"userid": userId, "order_status": 1, "delete_status": 0}, "", "", -1, -1)
|
|
|
//orderData := TiDb.SelectBySql("select * from dwd_f_userbase_order_info where userid=? and order_status=1 and delete_status=0 and payable_money > 0", userId)
|
|
|
- orderSql := `select a.*,b.product_type as productType from dataexport_order a
|
|
|
+ orderSql := fmt.Sprintf(`select a.*,b.product_type as productType from dataexport_order a
|
|
|
INNER JOIN jy_order_detail b on a.order_code=b.order_code and a.user_id = "%s" and
|
|
|
a.order_status = 1 and a.del_status =0
|
|
|
- ORDER BY b.service_endtime desc `
|
|
|
- orderData := TiDb.SelectBySql(orderSql, userId)
|
|
|
+ ORDER BY b.service_endtime desc `, userId)
|
|
|
+ orderData := TiDb.SelectBySql(orderSql)
|
|
|
if orderData != nil && len(*orderData) > 0 {
|
|
|
product_type_arr, product_type_arrs := []string{}, []string{}
|
|
|
for _, v := range *orderData {
|
WH01243