新增混合支付+完善新会员充值

business/jxstore/financial/pay.go

@@ -105,12 +105,27 @@ func OnCashFinished(order *model.Order) (err error) {
 //微信支付充值会员
 func OnWXPayFinished(order *model.Order) (err error) {
 	var (
+		db  = dao.GetDB()
 		ctx *jxcontext.Context
 	)
 	globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false))
+	//判断是新会员充值还是老会员续费
+	userMembers, err := dao.GetUserMember(db, order.UserID, model.MemberTypeNormal)
+	if err != nil {
+		return err
+	}
 	//根据订单类型来操作账户
 	if order.Type == model.OrderTypePay {
-		_, err = WXInvestMember(ctx, order.OrderType, order.UserID)
+		//为新会员生成会员信息并充值
+		if len(userMembers) > 0 {
+			if _, err := WXInvestMember(ctx, order.OrderType, order.UserID); err != nil {
+				return err
+			}
+		} else {
+			if _, err := WXInvestMemberNew(ctx, order.OrderType, order.UserID); err != nil {
+				return err
+			}
+		}
 	} else {
 		globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
 		return fmt.Errorf("暂不支持此订单类型！")