Merge branch 'dev/v2.4.31_rjj' of jianyu/qmx_admin into feature/v2.4.31

src/order/serviceOpen.go

@@ -571,7 +571,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 		bigEnd := cm.Int64All(userData["i_member_endtime"])
 		areaCount := cm.IntAll(filterMap["areaCount"])
 		ok, err := SubAccount(SubAccountParam{
-			BuyCount:         cm.IntAll(orderInfo["buy_count"]) + freeSubNum + paySubNum,
+			BuyCount:         cm.IntAll(orderInfo["buy_count"]),
 			BuySubject:       cm.IntAll(orderInfo["buy_subject"]),
 			StartTime:        time.Unix(bigStart, 0),
 			EndTime:          time.Unix(bigEnd, 0),
@@ -582,31 +582,11 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 			ProvinceCount:    cm.IntAll(cm.If(areaCount == 0, -1, areaCount)),
 			ProductType:      getBigMemberProductTypeByOrderCode(cm.ObjToString(filterMap["contactOrderCode"])),
 			Phone:            cm.ObjToString(orderInfo["user_phone"]),
+			OldOrderCode:     cm.ObjToString(filterMap["contactOrderCode"]),
 		})
 		if !ok && err != nil {
 			return err
 		}
-		if cm.IntAll(orderInfo["buy_subject"]) == 2 {
-			var sName string
-			if cm.IntAll(filterMap["comboId"]) != 0 {
-				if cm.IntAll(filterMap["comboId"]) == 5 {
-					sName = ComboCustom
-				} else {
-					combo := util.JysqlDB.FindOne("bigmember_combo", map[string]interface{}{"id": cm.IntAll(filterMap["comboId"])}, "", "")
-					if combo != nil && len(*combo) > 0 {
-						sName = cm.ObjToString((*combo)["s_name"])
-					}
-				}
-			}
-
-			st := time.Unix(bigStart, 0).Format(cm.Date_Full_Layout)
-			et := time.Unix(bigEnd, 0).Format(cm.Date_Full_Layout)
-			err := EntLicense(cm.IntAll(orderInfo["entId"]), cm.IntAll(orderInfo["buy_count"]), cm.IntAll(cm.If(cm.IntAll(filterMap["areaCount"]) > 0, cm.IntAll(filterMap["areaCount"]), -1)), cm.IntAll(orderInfo["id"]), 0, fmt.Sprintf("%s%s", "大会员", sName), st, et, cm.ObjToString(orderInfo["user_phone"]))
-			if err != nil {
-				log.Printf("EntLicense 创建企业授权信息失败：code:%s,err:%s", orderCode, err.Error())
-				return err
-			}
-		}
 		updateOrder["vip_starttime"] = time.Now().Format(cm.Date_Full_Layout)
 		updateOrder["vip_endtime"] = time.Unix(bigEnd, 0).Format(cm.Date_Full_Layout)
 

src/order/suppleSalePerson.go

@@ -903,6 +903,7 @@ type SubAccountParam struct {
 	ProvinceCount int
 	ProductType   string //
 	Phone         string
+	OldOrderCode  string
 }
 
 // SubAccount 子账号订单审核开通权限
@@ -939,9 +940,15 @@ func SubAccount(param SubAccountParam) (bool, error) {
 		}
 		ClearBigVipUserPower(param.UserId)
 	case 2:
+		var startTime, endTime time.Time
+		res := util.JysqlDB.SelectBySql("SELECT c.end_time,c.start_time FROM dataexport_order a LEFT JOIN entniche_order b on a.id = b.order_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.order_code = ?", param.OldOrderCode)
+		if res != nil && len(*res) > 0 {
+			startTime, _ = time.Parse(cm.Date_Full_Layout, cm.ObjToString((*res)[0]["start_time"]))
+			endTime, _ = time.Parse(cm.Date_Full_Layout, cm.ObjToString((*res)[0]["end_time"]))
+		}
 		//企业版本开通
-		if err := EntLicense(param.EntId, param.BuyCount, param.ProvinceCount, param.OrderId, 0,
-			param.StartTime.Format(cm.Date_Full_Layout), param.EndTime.Format(cm.Date_Full_Layout), param.ProductType, param.Phone); err != nil {
+		if err := EntLicense(param.EntId, param.BuyCount, param.ProvinceCount, param.OrderId, 0, param.ProductType,
+			startTime.Format(cm.Date_Full_Layout), endTime.Format(cm.Date_Full_Layout), param.Phone); err != nil {
 			return false, err
 		}
 	}