Browse Source

Merge branch 'dev/v4.9.14_rjj' of qmx/jy into feature/v4.9.14

renjiaojiao 1 năm trước cách đây
mục cha
commit
d1d8dce081
1 tập tin đã thay đổi với 3 bổ sung1 xóa
  1. 3 1
      src/jfw/modules/subscribepay/src/entity/reWardStruct.go

+ 3 - 1
src/jfw/modules/subscribepay/src/entity/reWardStruct.go

@@ -1,7 +1,9 @@
 package entity
 
 import (
+	qutil "app.yhyue.com/moapp/jybase/common"
 	"encoding/json"
+	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/util"
 	"log"
 	"time"
@@ -28,7 +30,7 @@ func (r *reWardStruct) PayCallBack(param *CallBackParam) bool {
 	filter, _ := json.Marshal(filterMap)
 	//生成订单
 	if util.Mysql.Insert("dataexport_order", map[string]interface{}{
-		"order_code":           param.OrderCode,
+		"order_code":           fmt.Sprintf("%s%s", time.Now().Format("150405"), qutil.GetRandom(6)),
 		"order_money":          param.TotalFee,
 		"pay_money":            param.CashFee,
 		"pay_time":             time.Now().Format("2006-01-02 15:04:05"),