aa

services/order.go

@@ -32,6 +32,18 @@ var (
 			}
 			return payPrice, err
 		},
+		model.OrderTypeCardValid: func(db *sqlx.DB, typeID string) (payPrice int64, err error) {
+			var (
+				avgPrice int64
+				count    = utils.Str2Int(typeID) //充卡有效期代表几个月
+			)
+			if config, err2 := dao.GetConfig(db, model.ConfigTypeSys, model.OrderTypeCardValid); err2 == nil && config != nil {
+				avgPrice = utils.Str2Int64(config.Value)
+			} else {
+				err = err2
+			}
+			return avgPrice * int64(count), err
+		},
 	}
 
 	payFunc = map[string]func(db *sqlx.DB, order *model.PayOrder, vendorPayType string) (err error){
@@ -77,7 +89,7 @@ var (
 					}
 				}
 			}
-			err = FlowIncome(db, iccID, flow, unit)
+			err = FlowIncome(db, iccID, flow, unit, model.FlowIncomeTypeUser)
 			//冲进去之后重新计算流量超标
 			sumIncome, _ := dao.GetSimFlowIncomeSum(db, iccID, monthBegin, monthEnd)
 			sumExpend, _ := dao.GetSimFlowExpendSum(db, iccID, monthBegin, monthEnd)
@@ -91,6 +103,10 @@ var (
 			}
 			return err
 		},
+		model.OrderTypeCardValid: func(db *sqlx.DB, order *model.PayOrder) (err error) {
+			_, err = api.TibiotAPI.Submit(order.ThingID, utils.Str2Int(order.TypeID))
+			return err
+		},
 	}
 )
 
@@ -166,5 +182,9 @@ func OnPayFinished(order *model.PayOrder) (err error) {
 		db = globals.GetDB()
 	)
 	err = payFinishedFunc[order.OrderType](db, order)
+	if err != nil {
+		order.Comment = err.Error()
+		dao.Update(db, order, "Comment")
+	}
 	return err
 }

services/sim.go

@@ -92,12 +92,12 @@ func SimFlowMonthSettle() {
 	printers, _ := dao.GetPrinters(db, 0, "", 0, 0, 0)
 	for _, v := range printers {
 		if v.IccID != "" {
-			FlowIncome(db, v.IccID, 30, "MB")
+			FlowIncome(db, v.IccID, 30, "MB", model.FlowIncomeTypeJX)
 		}
 	}
 }
 
-func FlowIncome(db *sqlx.DB, iccID string, flow float64, unit string) (err error) {
+func FlowIncome(db *sqlx.DB, iccID string, flow float64, unit string, incomeType int) (err error) {
 	var (
 		now = time.Now()
 	)
@@ -106,9 +106,9 @@ func FlowIncome(db *sqlx.DB, iccID string, flow float64, unit string) (err error
 		CreatedAt:    &now,
 		UpdatedAt:    &now,
 		LastOperator: "jxadmin",
-		IncomeType:   model.FlowIncomeTypeJX,
 		Flow:         30,
 		FlowUnit:     "MB",
+		IncomeType:   incomeType,
 	}
 	dao.Insert(db, flowIncome)
 	return err