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

src/order/orderManageController.go

@@ -2004,7 +2004,7 @@ func CreateSubOrder(context *admin.Context) (interface{}, error) {
 	//param.BuySubject = "1" //大会员补充包/子账号 均为购买个体
 	param.CreatePerson = context.User.Username
 	param.SaleTime = strings.Split(param.SaleTime, " ")[0] + " " + strings.Split(qutil.NowFormat(qutil.Date_Full_Layout), " ")[1]
-	if param.Phone == "" {
+	if param.Phone != "" {
 		userId, memberStatus := "", 0
 		bigStart, bigEnd := int64(0), int64(0)
 		//pay_sub_num, free_sub_num:=0, 0

src/order/orderManageService.go

@@ -1336,6 +1336,12 @@ func BigVipOrderDetails(res *map[string]interface{}) map[string]interface{} {
 				filterMap["newSerName"] = strings.Join(newSerName, ",")
 			}
 		}
+		if contactOrderCode := qutil.ObjToString(filterMap["contactOrderCode"]); contactOrderCode != "" {
+			idRes := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": contactOrderCode}, "id", "id desc")
+			if idRes != nil && len(*idRes) > 0 {
+				filterMap["contactOrderId"] = (*idRes)["id"]
+			}
+		}
 	}
 	// 订单状态
 	if order_status == -2 {