This commit is contained in:
苏尹岚
2020-10-20 11:51:42 +08:00
parent a765af69ee
commit 29946b79d9
6 changed files with 75 additions and 15 deletions

View File

@@ -218,7 +218,13 @@ func AcceptJob(ctx *jxcontext.Context, jobID int) (err error) {
JobID: jobID,
JobOrderID: jxutils.GenJobOrderNo(),
UserID: job.UserID,
Status: model.JobOrderStatusAccept,
// Status: model.JobOrderStatusAccept,
}
//美团会员任务
if jobID == 1 {
jobOrder.Status = model.JobOrderStatusSpec
} else {
jobOrder.Status = model.JobOrderStatusAccept
}
dao.Begin(db)
defer func() {

View File

@@ -60,6 +60,25 @@ func Pay(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (er
return err
}
func Cash(ctx *jxcontext.Context, orderID int) (err error) {
func Cash(ctx *jxcontext.Context, orderID, payType int, vendorPayType string) (err error) {
var (
db = dao.GetDB()
order = &model.Order{
OrderID: int64(orderID),
}
payHandler = &financial.PayHandler{
PayType: payType,
Ctx: ctx,
VendorPayType: vendorPayType,
}
)
err = dao.GetEntity(db, order, "OrderID")
payHandler.Order = order
//如果用户没有对应账单信息就给他生成一条
userBill, err := dao.GetUserBill(db, order.UserID, "")
if userBill == nil {
err = financial.AddUserBill(db, jxutils.GenBillID(), order.UserID)
}
err = payHandler.CreateRefund()
return err
}