Merge branch 'v1.0.1_ws' of moapp/jy_docs into feature/v1.0.1

rpc/partnerlib/service/userBuy.go

@@ -197,13 +197,13 @@ func UBHandle(in *partnerlib.UserBuyVipRequest) (res *partnerlib.UBVRes, err err
 					warn.SendMsgByWXURL(fmt.Sprintf("%s文档名称： %s，文档id：%s,购买会员编号：%s,请求信息：%v", entity.PartnerName, docInfo.DocName, docInfo.Id, params["orderNo"], in))
 				}
 			}
-			//更新用户会员信息缓存
-			partner.SetUserOrderInfo(entity.RedisCode, cacheKey, 24*60*60)
 		} else {
 			nextStep = true
 		}
 	}
 	if nextStep {
+		//更新用户会员信息缓存
+		partner.SetUserOrderInfo(entity.RedisCode, cacheKey, 24*60*60)
 		//是否需要购买文档--精品
 		if docInfo.ProductType == 2 {
 			var orderCode = util.GetOrderCode()

services/partner/docsBuyOrder.go

@@ -26,7 +26,7 @@ func GetDocOrderInfo(positionId int64, mgoUserId string, state int) (orderInfo *
 	if err == nil && len(orderInfos) > 0 {
 		orderInfo = orderInfos[0]
 	}
-	return
+	return &model.DocinUserOrder{}, err
 }
 
 // 剑鱼文库会员订单信息