Ver Fonte

wip:业绩生效

wangkaiyue há 10 meses atrás
pai
commit
8e00e6425f

+ 0 - 16
src/jfw/modules/subscribepay/src/entity/payCommonEntity.go

@@ -3,7 +3,6 @@ package entity
 import (
 	. "app.yhyue.com/moapp/jybase/date"
 	"database/sql"
-	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
 	"jy/src/jfw/modules/subscribepay/src/util"
@@ -20,21 +19,6 @@ func TakeEffectSale(orderCode string, payMoney int) {
 			"ordercode": orderCode,
 		}, "state", "")
 		if res == nil || len(*res) == 0 {
-			g.Dump("TakeEffectSale", orderCode, payMoney, map[string]interface{}{
-				"state":           1,
-				"ordercode":       orderCode,
-				"saler_dept":      "运营部",
-				"saler_dept_id":   27103,
-				"saler_name":      "-",
-				"saler_Id":        -1,
-				"money":           payMoney,
-				"change_value":    payMoney,
-				"group_uuid":      uuid.New().String(),
-				"operator":        "系统自动",
-				"change_reason":   "回款成功",
-				"create_time":     FormatDate(&now, "2006-01-02 15:04:05"),
-				"statistics_time": FormatDate(&now, "2006-01-02 15:04:05"),
-			})
 			//销售业绩
 			if util.Mysql.InsertByTx(tx, "order_sale_record", map[string]interface{}{
 				"state":           1,

+ 2 - 2
src/jfw/modules/subscribepay/src/entity/reWardStruct.go

@@ -52,8 +52,8 @@ func (r *reWardStruct) PayCallBack(param *CallBackParam) bool {
 	}) < 0 {
 		log.Println("生成订单出错")
 	}
-	//销售业绩生效
-	TakeEffectSale(orderCode, param.CashFee)
+	//销售业绩创建需要订单code
+	param.OrderCode = orderCode
 	return util.MQFW.Update("reward", query, map[string]interface{}{
 		"$set": map[string]interface{}{
 			"i_status":        1,

+ 1 - 1
src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -624,7 +624,7 @@ func (this *CommonAction) Createorder() {
 			insertM["buy_count"] = 1
 		}
 		var orderid int64
-		ok := util.Mysql.ExecTx("创建代用户下单", func(tx *sql.Tx) bool {
+		ok := util.Mysql.ExecTx("创建订单公共方法", func(tx *sql.Tx) bool {
 			orderid = util.Mysql.InsertByTx(tx, "dataexport_order", insertM)
 			if orderid <= 0 {
 				return false