fix:计费修改

internal/jyutil/equityOpen.go

@@ -2,6 +2,7 @@ package jyutil
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/go-xweb/log"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	frpc "app.yhyue.com/moapp/jybase/rpc"
@@ -12,6 +13,7 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/util/gconv"
 	"net/rpc"
+	"time"
 )
 
 var (
@@ -74,6 +76,7 @@ func SaveUpEntOrder(ctx context.Context, waitEmpowerId, orderId int) error {
 		_, err = g.DB().Ctx(ctx).Insert(ctx, "entniche_order", map[string]interface{}{
 			"order_detail_id": orderId,
 			"wait_empower_id": waitEmpowerId,
+			"create_time":     time.Now().Format(date.Date_Full_Layout),
 		})
 		if err != nil {
 			return errors.New(fmt.Sprintf("套餐续费失败 id: %d", waitEmpowerId))

internal/logic/order/detail.go

@@ -418,7 +418,7 @@ WHERE eo.wait_empower_id = %s and jod.is_service_open =1 and jod.status =1 and e
 	}
 	result["returnRes"] = map[string]interface{}{
 		"returnMoney":    returnMoney,
-		"remainingMoney": gconv.Int(orderData.Map()["pay_money"]) - returnMoney,
+		"remainingMoney": gconv.Int(orderData.Map()["pure_amount"]) - returnMoney,
 		"returnInfo":     returnArr,
 	}
 	//回款计划

internal/logic/order/examine.go

@@ -253,7 +253,6 @@ func CheckAutoAudit(ctx context.Context, orderData map[string]interface{}, produ
 		log.Println("自动审核不通过signing_subject:", orderData["signing_subject"])
 		return false
 	}
-	isEnt := gconv.Int(orderData["buy_subject"]) == 2
 	var (
 		insertData              []map[string]interface{}
 		activityProduct         = make(map[string][]map[string]interface{})
@@ -261,8 +260,11 @@ func CheckAutoAudit(ctx context.Context, orderData map[string]interface{}, produ
 		beforePrice, afterPrice float64
 		giftDiscountRate        []float64
 	)
-
+	//isEnt := gconv.Int(orderData["buy_subject"]) == 2
 	for _, m := range productList {
+		if common.IntAll(m["service_type"]) == 3 {
+			return false
+		}
 		productItem, err := service.Product().GetProduct(gconv.String(m["product_code"]))
 		if err != nil {
 			return false
@@ -310,8 +312,8 @@ func CheckAutoAudit(ctx context.Context, orderData map[string]interface{}, produ
 		switch productType := common.InterfaceToStr(m["product_type"]); productType {
 		case "VIP订阅":
 			switch common.IntAll(m["service_type"]) {
-			case 3: //升级
-				monthCount = GetUserTime(gconv.String(orderData["user_phone"]), gconv.String(m["linked_detail_id"]), true, isEnt)
+			//case 3: //升级
+			//	monthCount = GetUserTime(gconv.String(orderData["user_phone"]), gconv.String(m["linked_detail_id"]), true, isEnt)
 			default:
 				cycleType = common.If(common.IntAll(filterMap["buy_type"]) > 0, common.IntAll(filterMap["buy_type"]), common.IntAll(filterMap["give_type"])).(int) //1天 2月 3年 4季度
 				cycleCount = common.IntAll(filterMap["buy_cycle"]) + common.IntAll(filterMap["give_cycle"])
@@ -347,8 +349,8 @@ func CheckAutoAudit(ctx context.Context, orderData map[string]interface{}, produ
 			}
 			//大会员 createType:1新建 2补充 3延长
 			switch common.IntAll(m["service_type"]) {
-			case 3: //升级
-				monthCount = GetUserTime(gconv.String(orderData["user_phone"]), gconv.String(orderData["linked_detail_id"]), true, isEnt)
+			//case 3: //升级
+			//	monthCount = GetUserTime(gconv.String(orderData["user_phone"]), gconv.String(orderData["linked_detail_id"]), true, isEnt)
 			default:
 				cycleType = common.If(common.IntAll(filterMap["buy_type"]) > 0, common.IntAll(filterMap["buy_type"]), common.IntAll(filterMap["give_type"])).(int) //1天 2月 3年 4季度
 				cycleCount = common.IntAll(filterMap["buy_cycle"]) + common.IntAll(filterMap["give_cycle"])

internal/logic/product/bigmember/BigMemberBuyTry.go

@@ -19,6 +19,7 @@ import (
 
 func (p jyBigProduct) NewBigOpenService(ctx context.Context, startDate, endDate time.Time, buyCount, buySubject, entId int, pid int64) error {
 	cycle := common.If(p.param.Filter.ComboId == 0, 5, p.param.Filter.ComboId).(int)
+	cycle = common.If(p.param.Filter.FinalAreaCount == 1, 6, cycle).(int)
 	sets := map[string]interface{}{
 		"i_member_status":      common.If(startDate.Unix() <= time.Now().Unix(), cycle, -cycle),
 		"i_member_starttime":   startDate.Unix(),
@@ -29,7 +30,7 @@ func (p jyBigProduct) NewBigOpenService(ctx context.Context, startDate, endDate
 	// p238 大会员省份版-商机版2.0单省版 可订阅省份数量为1个
 	var unset map[string]interface{}
 	//if common.IntAll(filterMap["areaCount"]) > 0 { // 省份版
-	if p.param.Filter.ComboId == 30190 { // 省份版
+	if p.param.Filter.FinalAreaCount == 1 { // 省份版
 		sets["o_member_jy.i_areacount"] = 1
 		sets["o_member_jy.o_area"] = map[string]interface{}{
 			"北京": []interface{}{},

internal/logic/product/bigmember/bigmember.go

@@ -221,6 +221,7 @@ func (p jyBigProduct) SaveUpdate(ctx context.Context, masterKey string) error {
 			}
 			filter.ServiceIds = strings.Split(gconv.String(combo.Map()["s_servers"]), ",")
 		}
+		filter.FinalAreaCount = productItem.UnitNum
 		filter.CutAccount = productClass.CutAccount
 	case 2, 3: //续费升级
 		var startTime, endTime time.Time