add

business/jxstore/financial/bill.go

@@ -169,7 +169,7 @@ func SettleUnionOrders(ctx *jxcontext.Context, vendorIDs []int) (err error) {
 
 func WXInvestMember(ctx *jxcontext.Context, memberID int, userID string, isFree bool) (errCode string, err error) {
 	var db = dao.GetDB()
-	//获取用户当前用户信息
+	//获取用户 当前会员信息
 	userMembers, err := dao.GetUserMember(db, userID, model.MemberTypeNormal)
 	//获取用户微信下单信息
 	//userBill, err := dao.GetUserBill(db, userID, "")

business/jxstore/financial/financial.go

@@ -269,7 +269,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 			payStatus = model.OrderStatusFailPay
 		}
 		//充值会员 增加微信支付处理业务
-		if order.OrderType == 2 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
+		if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
 			if err := OnWXPayFinished(order); err != nil {
 				return err
 			}

business/jxstore/financial/pay.go

@@ -117,15 +117,13 @@ func OnWXPayFinished(order *model.Order) (err error) {
 		}
 	}()
 	//获取用户会员信息
-	userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal)
+	//userMember, err := dao.GetUserMember(db, order.UserID, model.UserStatusNormal)
 	//根据订单类型来操作账户
-	switch order.Type {
-	case model.OrderTpyeMember:
-		//微信支付充值会员
-		if _, err = WXInvestMember(ctx, userMember[0].MemberTypeID, order.UserID, true); err != nil {
+	if order.Type == 1 {
+		if _, err = WXInvestMember(ctx, order.OrderType, order.UserID, true); err != nil {
 			dao.Rollback(db, txDB)
 		}
-	default:
+	} else {
 		globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
 		return fmt.Errorf("暂不支持此订单类型！")
 	}