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

business/model/bill.go

@@ -12,9 +12,11 @@ const (
 	BillTypeDropShippingDeposit             = 18 //一件代发保证金
 	BillTypeUnionShare                      = 19 //联盟任务分成
 
-	BillTypeMember = 20 //开通会员
-
-	BillTypeQuitGroup = 30 //退群
+	BillTypeMember              = 20 //开通会员
+	BillTypePayByAccountBalance = 25 //余额支付
+	BillTypePayByMixPay1        = 26 //混合支付中的 余额部分状态码
+	BillTypePayByMixPay2        = 27 //混合支付中的 微信部分状态码
+	BillTypeQuitGroup           = 30 //退群
 
 	BillTypeJdWaybillOverWeight = 40 //京东物流超重扣款
 

business/model/dao/dao_order.go

@@ -124,6 +124,22 @@ type GetOrdersResult struct {
 	Mobile   string `json:"mobile"`
 }
 
+var TableOrder = "order"
+
+func GetOrderByID(db *DaoDB, orderID string) (orderInfos *model.Order, err error) {
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	sql := `SELECT * FROM %s WHERE order_id = ?`
+	sqlParams = append(sqlParams, TableOrder, orderID)
+	txDB, _ := Begin(db)
+	defer Commit(db, txDB)
+	if err = GetRowsTx(txDB, &orderInfos, sql, sqlParams); err != nil {
+		return nil, err
+	}
+	return orderInfos, err
+}
+
 func GetOrders(db *DaoDB, orderID, userID string, orderType int, cityCodes []int, fromTime, toTime time.Time, keyword string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) {
 	var orders []*GetOrdersResult
 	sql := `