Merge branch 'dev4.6.2.17' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.17

src/jfw/modules/subscribepay/src/entity/resourcePackStruct.go

@@ -50,14 +50,14 @@ func (this *resoucePackStruct) PayCallBack(param *CallBackParam) bool {
 				return false
 			}
 			go PayCancel(userId, ATTACHMENT, "")
-			udata, errs := util.MQFW.FindOneByField("user", userId, `{"l_vip_endtime":1}`)
+			udata, errs := util.MQFW.FindById("user", userId, `{"l_vip_endtime":1}`)
 			vipendtime := int64(0)
 			if udata != nil && errs {
 				vipendtime = qu.Int64All((*udata)["l_vip_endtime"])
 			}
 			//userId, product, resourceType, num, spec, endTime string, remarks map[string]interface{}, vipEndTime int64
 			okk, err := InitPurchase(userId, ATTACHMENT, ATTACHMENT, strconv.Itoa(qu.IntAll(filterM["num"])), "个",
-				qu.ObjToString(filterM["validTime"]), filterM, vipendtime).PurchaseUserBalance()
+				JyresoucePack.LastDate(now).Format(qu.Date_Short_Layout), filterM, vipendtime).PurchaseUserBalance()
 			if !okk {
 				log.Printf("用户%sPurchaseUserBalance出错：%v", userId, (*orderData)["order_code"], err)
 				return false