Jelajahi Sumber

fix:计费修改

duxin 1 bulan lalu
induk
melakukan
fbb5435805
4 mengubah file dengan 16 tambahan dan 15 penghapusan
  1. 1 0
      go.sum
  2. 2 2
      internal/logic/timedTask/init.go
  3. 11 13
      internal/logic/timedTask/onlineReturnMoney.go
  4. 2 0
      main.go

+ 1 - 0
go.sum

@@ -1637,6 +1637,7 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qq
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

+ 2 - 2
internal/logic/timedTask/init.go

@@ -12,8 +12,8 @@ func init() {
 
 func AutoReturnTask() {
 	cr := cron.New()
-	AutomaticPayment()  //首次执行
-	OnlineReturnMoney() //首次执行
+	go AutomaticPayment()  //首次执行
+	go OnlineReturnMoney() //首次执行
 	cr.AddFunc(g.Cfg().MustGet(context.Background(), "autoReturnTaskTime", "0 */3 * * * ?").String(), AutomaticPayment)
 	cr.AddFunc(g.Cfg().MustGet(context.Background(), "onlineReturnMoney", "0 */2 * * * ?").String(), OnlineReturnMoney)
 	cr.Start()

+ 11 - 13
internal/logic/timedTask/onlineReturnMoney.go

@@ -32,9 +32,7 @@ func OnlineReturnMoney() {
 				payWay        = gconv.String(m["pay_way"])
 			)
 
-			orderData, _ := g.DB().GetOne(ctx, "dataexport_order", map[string]interface{}{
-				"order_code": orderCode,
-			}, "", "")
+			orderData, _ := g.DB().GetOne(ctx, "SELECT * FROM dataexport_order WHERE order_code = ?", orderCode)
 			if orderData.IsEmpty() {
 				continue
 			}
@@ -116,28 +114,28 @@ func OnlineReturnMoney() {
 				}
 
 				if orderUpdate["return_status"] == 1 && consts.PhoneRegex.MatchString(gconv.String(orderData["user_phone"])) {
-					productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1 and returned_open = 0 and is_service_open = 0 and status =1`, orderCode))
+					productDetail, _ := g.DB().Ctx(ctx).Query(ctx, fmt.Sprintf(`SELECT * FROM jy_order_detail WHERE order_code ='%s' and returned_open =1  and is_service_open = 0 and status =1`, orderCode))
 					if !productDetail.IsEmpty() {
 						//全额回款开通权益
 						for _, o := range productDetail.List() {
-							if !jyutil.IsServiceOpen(m) {
+							if !jyutil.IsServiceOpen(o) {
 								continue
 							}
-							m["userMap"] = map[string]interface{}{
+							o["userMap"] = map[string]interface{}{
 								"userData": uData, "entId": entId, "userPositionId": userPositionId,
 							}
 							//参数注入
-							m["phone"] = o["user_phone"]
-							m["order_code"] = orderCode
-							m["amount"] = m["final_price"]
-							m["reqCompanyName"] = o["company_name"]
-							m["reqSubject"] = o["buy_subject"]
-							productCode := gconv.String(m["product_code"])
+							o["phone"] = orderData.Map()["user_phone"]
+							o["order_code"] = orderCode
+							o["amount"] = o["final_price"]
+							o["reqCompanyName"] = orderData.Map()["company_name"]
+							o["reqSubject"] = orderData.Map()["buy_subject"]
+							productCode := gconv.String(o["product_code"])
 							pFunc, err := product.JyProFunc.GetProductInitFuncByCode(productCode)
 							if err != nil {
 								continue
 							}
-							pObj, err := pFunc(m)
+							pObj, err := pFunc(o)
 							if err != nil {
 								gerror.Wrap(err, fmt.Sprintf("获取%s商品异常", productCode))
 								continue

+ 2 - 0
main.go

@@ -6,6 +6,7 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"jyOrderManager/internal/cmd"
 	_ "jyOrderManager/internal/logic"
+	"jyOrderManager/internal/logic/timedTask"
 )
 
 func main() {
@@ -18,5 +19,6 @@ func main() {
 	//if err != nil {
 	//	panic(err)
 	//}
+	go timedTask.AutoReturnTask()
 	cmd.Main.Run(gctx.GetInitCtx())
 }