This commit is contained in:
邹宗楠
2022-07-08 18:23:25 +08:00
parent 846e548d2c
commit b67d3556cf
9 changed files with 431 additions and 66 deletions

View File

@@ -206,7 +206,7 @@ func CancelWayOrder(ctx *jxcontext.Context, userId string, param *bida.CancelOrd
}
if time.Now().Unix()-order.CreatedAt.Unix() <= 30 {
return errors.New("支付成功后,超过一分钟才能取消")
return errors.New("支付成功后,超过30s才能取消")
}
// 待支付或者支付失败
@@ -384,16 +384,11 @@ func CreateOrder2QBiDa(order *model.UserVendorOrder) error {
makeOrder.ReceiveName = receiveAddress.ConsigneeName
makeOrder.ReceivePhone = receiveAddress.ConsigneeMobile
otherId, err := createOtherOrder(makeOrder)
//if err != nil {
// return err
//}
//order.OrderStatus = model.OrderStatusSuccessPay // 支付成功
order.OtherWayBill = otherId
order.OrderStatus = model.OrderStatusWaitPickup
order.UpdatedAt = time.Now()
if _, err = dao.UpdateEntity(dao.GetDB(), order, "OtherWayBill", "OrderStatus", "UpdatedAt"); err != nil {
globals.SugarLogger.Debug("err=2===============", err)
return err
}
return nil