xuzhiheng 5 年之前
父節點
當前提交
0b23a4c25f
共有 1 個文件被更改,包括 29 次插入21 次删除
  1. 29 21
      src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

+ 29 - 21
src/jfw/modules/subscribepay/src/service/vipRenewUpgrade.go

@@ -46,28 +46,36 @@ func (this *RenewUpgrade) GetBuyMsg() {
 		buyset := vipjy["o_buyset"]
 		//		isvalidOk := true
 
-		//		str, oks := util.MQFW.FindOne("vip_upgrade", bson.M{"s_userid": userId, "i_isvalid": 0})
-		//		if oks && len(*str) > 0 && *str != nil {
-		//			area = (*str)["o_area"]
-		//			buyerclass = (*str)["a_buyerclass"]
-		//			isvalidOk = false
-		//		}
-
-		dataArr := map[string]interface{}{
-			"area":       area,
-			"buyerclass": buyerclass,
-			"cycleunit":  cycleunit,
-			"cyclecount": cyclecount,
-			"starttime":  starttime,
-			"endtime":    endtime,
-			"start":      start,
-			"end":        end,
-			"now":        now,
-			"vipStatus":  vipStatus,
-			"buyset":     buyset,
-			//			"isvalidOk":  isvalidOk,
+		orderdata := util.Mysql.FindOne("dataexport_order", map[string]interface{}{
+			"user_id":      userId,
+			"order_status": 1,
+		}, "filter", "create_time desc")
+		vmsg := entity.VipSimpleMsg{}
+		if len(*orderdata) > 0 && *orderdata != nil {
+			filterStr := qutil.ObjToString((*orderdata)["filter"])
+			if err := json.Unmarshal([]byte(filterStr), &vmsg); err != nil {
+				log.Printf("%s vipSubscribeStruct PayCallBack Unmarshal 出错 [%s]\n", filterStr)
+				return
+			}
+			allArea := vmsg.Area
+			allIndustry := vmsg.Industry
+			dataArr := map[string]interface{}{
+				"area":        area,
+				"buyerclass":  buyerclass,
+				"cycleunit":   cycleunit,
+				"cyclecount":  cyclecount,
+				"starttime":   starttime,
+				"endtime":     endtime,
+				"start":       start,
+				"end":         end,
+				"now":         now,
+				"vipStatus":   vipStatus,
+				"buyset":      buyset,
+				"allarea":     allArea,
+				"allindustry": allIndustry,
+			}
+			this.ServeJson(dataArr)
 		}
-		this.ServeJson(dataArr)
 	}
 }